Code

Fix crash: desktop does not always have an event_context attached to it!
authordvlierop2 <dvlierop2@users.sourceforge.net>
Tue, 7 Apr 2009 18:42:48 +0000 (18:42 +0000)
committerdvlierop2 <dvlierop2@users.sourceforge.net>
Tue, 7 Apr 2009 18:42:48 +0000 (18:42 +0000)
src/snap.cpp

index 19455ba73be27785ef87a8cbee0fb8632a90e521..392e1c075726b9523cfe7591c22fdc12b726410e 100644 (file)
@@ -161,7 +161,7 @@ Inkscape::SnappedPoint SnapManager::freeSnap(Inkscape::SnapPreferences::PointTyp
                                              bool first_point,
                                              Geom::OptRect const &bbox_to_snap) const
 {
-       if (_desktop->event_context->_snap_window_open == false) {
+       if (_desktop->event_context && _desktop->event_context->_snap_window_open == false) {
                g_warning("context_snap_window_open has not been set to true by the current context. Please report this!");
                // When the context goes into dragging-mode, then Inkscape should call this: sp_event_context_snap_window_open(event_context);
        }
@@ -296,7 +296,7 @@ Inkscape::SnappedPoint SnapManager::constrainedSnap(Inkscape::SnapPreferences::P
                                                     bool first_point,
                                                     Geom::OptRect const &bbox_to_snap) const
 {
-       if (_desktop->event_context->_snap_window_open == false) {
+       if (_desktop->event_context && _desktop->event_context->_snap_window_open == false) {
                g_warning("context_snap_window_open has not been set to true by the current context. Please report this!");
                // When the context goes into dragging-mode, then Inkscape should call this: sp_event_context_snap_window_open(event_context);
        }
@@ -334,7 +334,7 @@ void SnapManager::guideSnap(Geom::Point &p, Geom::Point const &guide_normal) con
 {
     // This method is used to snap a guide to nodes or to other guides, while dragging the guide around. Will not snap to grids!
 
-       if (_desktop->event_context->_snap_window_open == false) {
+       if (_desktop->event_context && _desktop->event_context->_snap_window_open == false) {
                        g_warning("context_snap_window_open has not been set to true by the current context. Please report this!");
                        // When the context goes into dragging-mode, then Inkscape should call this: sp_event_context_snap_window_open(event_context);
        }