From f6dfb0094cf095241377fae52ed02247cf3d03f5 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Thu, 16 Aug 2012 12:48:29 -0700 Subject: [PATCH] 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 --- dive.h | 1 + divelist.c | 1 - info.c | 3 ++- profile.c | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dive.h b/dive.h index eb9accb..b42668c 100644 --- a/dive.h +++ b/dive.h @@ -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 a85ac7c..de64bd8 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 diff --git a/info.c b/info.c index 6842d3d..e9a08ca 100644 --- a/info.c +++ b/info.c @@ -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); } diff --git a/profile.c b/profile.c index 137ed6f..7a0eac4 100644 --- a/profile.c +++ b/profile.c @@ -14,6 +14,7 @@ #include "color.h" int selected_dive = 0; +int *selectiontracker; typedef enum { STABLE, SLOW, MODERATE, FAST, CRAZY } velocity_t; -- 2.43.0