diff options
author | Dirk Hohndel <dirk@hohndel.org> | 2012-08-16 12:48:29 -0700 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2012-08-16 12:51:32 -0700 |
commit | f6dfb0094cf095241377fae52ed02247cf3d03f5 (patch) | |
tree | 387b29f58f15d8056a3b715d7747e891ab887fad | |
parent | 673cf274f8841686019827ff0f7c81d0f04f813b (diff) | |
download | subsurface-f6dfb0094cf095241377fae52ed02247cf3d03f5.tar.gz |
Fix right click edit in Dive Notes area for multiple dives
This fixes the bug that triggered the SIGSEGV that Linus worked around
earlier. I had forgotten to update this call path to the
edit_multi_dive_info function.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r-- | dive.h | 1 | ||||
-rw-r--r-- | divelist.c | 1 | ||||
-rw-r--r-- | info.c | 3 | ||||
-rw-r--r-- | profile.c | 1 |
4 files changed, 4 insertions, 2 deletions
@@ -281,6 +281,7 @@ struct dive_table { extern struct dive_table dive_table; +extern int *selectiontracker; extern int selected_dive; #define current_dive (get_dive(selected_dive)) diff --git a/divelist.c b/divelist.c index a85ac7c5e..de64bd88c 100644 --- a/divelist.c +++ b/divelist.c @@ -79,7 +79,6 @@ static void dump_model(GtkListStore *store) #endif static GList *selected_dives; -static int *selectiontracker; /* when subsurface starts we want to have the last dive selected. So we simply walk to the first leaf (and skip the summary entries - which have negative @@ -132,11 +132,12 @@ static int delete_dive_info(struct dive *dive) static void info_menu_edit_cb(GtkMenuItem *menuitem, gpointer user_data) { - edit_dive_info(current_dive); + edit_multi_dive_info(amount_selected, selectiontracker); } static void info_menu_delete_cb(GtkMenuItem *menuitem, gpointer user_data) { + /* this needs to delete all the selected dives as well, I guess? */ delete_dive_info(current_dive); } @@ -14,6 +14,7 @@ #include "color.h" int selected_dive = 0; +int *selectiontracker; typedef enum { STABLE, SLOW, MODERATE, FAST, CRAZY } velocity_t; |