Fix crashes on using wrong tools

diff --git a/ChangeLog b/ChangeLog
index 4ea2d0fe38ed8f262af99721b53dedd339e9bc93..7e607425197be73a0c9a0fbaa5b3f0db819c9e73 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 2007-09-23
 Evan Battaglia <gtoevan@gmx.net>
        * Fix copy & pasting DEM layers -- new serializing string list code.
+       * Don't crash if using tool on wrong type of layer / no layer.
+               Although I really want to know what happened to "use the top visible layer",
+               and return TRUE if the tool "accepts" the use...
+               editing lots of TRWLayers was way easier that way...
 
 2007-09-22
 Evan Battaglia <gtoevan@gmx.net>

diff --git a/src/vikdemlayer.c b/src/vikdemlayer.c
index ed36efa4c26675fbb1973d1ec064ac5a22697b5b..e755d674cfd49b1a37cf51d68c3bfdca07cb896f 100644 (file)
--- a/src/vikdemlayer.c
+++ b/src/vikdemlayer.c
@@ -933,8 +933,6 @@ static gboolean dem_layer_download_release ( VikDEMLayer *vdl, GdkEventButton *e
   gchar *full_path;
   gchar *dem_file = NULL;
 
-  if ( !vdl) return FALSE;
-
   if ( vdl->source == DEM_SOURCE_NONE )
     a_dialog_error_msg ( VIK_GTK_WINDOW_FROM_LAYER(vdl), "No download source selected. Edit layer properties." );
 

diff --git a/src/vikwindow.c b/src/vikwindow.c
index b6794cbc7f191a6cb9e9b87e722ee005d230369d..03a061bdf0983bdcbdd130ee6e7a92583ae314b8 100644 (file)
--- a/src/vikwindow.c
+++ b/src/vikwindow.c
@@ -83,7 +83,9 @@ static void menu_delete_layer_cb ( GtkAction *a, VikWindow *vw );
 typedef struct {
   VikToolInterface ti;
   gpointer state;
+  gint layer_type;
 } toolbox_tool_t;
+#define TOOL_LAYER_TYPE_NONE -1
 
 typedef struct {
   int                  active_tool;
@@ -94,7 +96,7 @@ typedef struct {
 
 static void menu_tool_cb ( GtkAction *old, GtkAction *a, VikWindow *vw );
 static toolbox_tools_t* toolbox_create(VikWindow *vw);
-static void toolbox_add_tool(toolbox_tools_t *vt, VikToolInterface *vti);
+static void toolbox_add_tool(toolbox_tools_t *vt, VikToolInterface *vti, gint layer_type );
 static int toolbox_get_tool(toolbox_tools_t *vt, const gchar *tool_name);
 static void toolbox_activate(toolbox_tools_t *vt, const gchar *tool_name);
 static void toolbox_click (toolbox_tools_t *vt, GdkEventButton *event);
@@ -948,10 +950,11 @@ static toolbox_tools_t* toolbox_create(VikWindow *vw)
   return vt;
 }
 
-static void toolbox_add_tool(toolbox_tools_t *vt, VikToolInterface *vti)
+static void toolbox_add_tool(toolbox_tools_t *vt, VikToolInterface *vti, gint layer_type )
 {
   vt->tools = g_renew(toolbox_tool_t, vt->tools, vt->n_tools+1);
   vt->tools[vt->n_tools].ti = *vti;
+  vt->tools[vt->n_tools].layer_type = layer_type;
   if (vti->create) {
     vt->tools[vt->n_tools].state = vti->create(vt->vw, vt->vw->viking_vvp);
   } 
@@ -1002,7 +1005,9 @@ static void toolbox_click (toolbox_tools_t *vt, GdkEventButton *event)
 {
   VikLayer *vl = vik_layers_panel_get_selected ( vt->vw->viking_vlp );
   if (vt->active_tool != -1 && vt->tools[vt->active_tool].ti.click) {
-    vt->tools[vt->active_tool].ti.click(vl, event, vt->tools[vt->active_tool].state);
+    gint ltype = vt->tools[vt->active_tool].layer_type;
+    if ( ltype == TOOL_LAYER_TYPE_NONE || (vl && ltype == vl->type) )
+      vt->tools[vt->active_tool].ti.click(vl, event, vt->tools[vt->active_tool].state);
   }
 }
 
@@ -1010,15 +1015,19 @@ static void toolbox_move (toolbox_tools_t *vt, GdkEventButton *event)
 {
   VikLayer *vl = vik_layers_panel_get_selected ( vt->vw->viking_vlp );
   if (vt->active_tool != -1 && vt->tools[vt->active_tool].ti.move) {
-    vt->tools[vt->active_tool].ti.move(vl, event, vt->tools[vt->active_tool].state);
+    gint ltype = vt->tools[vt->active_tool].layer_type;
+    if ( ltype == TOOL_LAYER_TYPE_NONE || (vl && ltype == vl->type) )
+      vt->tools[vt->active_tool].ti.move(vl, event, vt->tools[vt->active_tool].state);
   }
 }
 
 static void toolbox_release (toolbox_tools_t *vt, GdkEventButton *event)
 {
   VikLayer *vl = vik_layers_panel_get_selected ( vt->vw->viking_vlp );
-  if (vt->active_tool != -1 && vt->tools[vt->active_tool].ti.release) {
-    vt->tools[vt->active_tool].ti.release(vl, event, vt->tools[vt->active_tool].state);
+  if (vt->active_tool != -1 && vt->tools[vt->active_tool].ti.release ) {
+    gint ltype = vt->tools[vt->active_tool].layer_type;
+    if ( ltype == TOOL_LAYER_TYPE_NONE || (vl && ltype == vl->type) )
+      vt->tools[vt->active_tool].ti.release(vl, event, vt->tools[vt->active_tool].state);
   }
 }
 /** End tool management ************************************/
@@ -1741,8 +1750,8 @@ static void window_create_ui( VikWindow *window )
   uim = gtk_ui_manager_new ();
   window->uim = uim;
 
-  toolbox_add_tool(window->vt, &ruler_tool);
-  toolbox_add_tool(window->vt, &zoom_tool);
+  toolbox_add_tool(window->vt, &ruler_tool, TOOL_LAYER_TYPE_NONE);
+  toolbox_add_tool(window->vt, &zoom_tool, TOOL_LAYER_TYPE_NONE);
 
   error = NULL;
   if (!(mid = gtk_ui_manager_add_ui_from_string (uim, menu_xml, -1, &error))) {
@@ -1807,7 +1816,7 @@ static void window_create_ui( VikWindow *window )
                            vik_layer_get_interface(i)->tools[j].name,
                            GTK_UI_MANAGER_TOOLITEM, FALSE);
 
-      toolbox_add_tool(window->vt, &(vik_layer_get_interface(i)->tools[j]));
+      toolbox_add_tool(window->vt, &(vik_layer_get_interface(i)->tools[j]), i);
 
       radio->name = vik_layer_get_interface(i)->tools[j].name;
       radio->stock_id = vik_layer_get_interface(i)->tools[j].name,