diff options
| author |  Henrik Brautaset Aronsen <subsurface@henrik.synth.no> | 2012-11-04 20:35:59 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2012-11-05 09:05:02 -0800 |
| commit | 37e3ade2e27b64f0696102e4ec421176ae430ffd (patch) | |
| tree | 8ade4ed484093febb1d5e2fd8457499b46081105 | |
| parent | 45fce18fb24fe291f8b1f5c65ff95ea0a5046a33 (diff) | |
| download | subsurface-37e3ade2e27b64f0696102e4ec421176ae430ffd.tar.gz | |
Repair broken Add Dive menu item
Lubomir's commit aec904b612cbee57f8bb5c3289a120b69c9ade24 broke the Add
Dive menu item: The Edit Dive dialogue didn't show up after the initial
dialogue.
Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | dive.h | 2 | ||||
| -rw-r--r-- | divelist.c | 2 | ||||
| -rw-r--r-- | info.c | 7 |
3 files changed, 6 insertions, 5 deletions
@@ -415,7 +415,7 @@ extern void evn_foreach(void (*callback)(const char *, int *, void *), void *dat extern int add_new_dive(struct dive *dive); extern gboolean edit_trip(dive_trip_t *trip); -extern int edit_dive_info(struct dive *dive); +extern int edit_dive_info(struct dive *dive, gboolean newdive); extern int edit_multi_dive_info(struct dive *single_dive); extern void dive_list_update_dives(void); extern void flush_divelist(struct dive *dive); diff --git a/divelist.c b/divelist.c index c1e240d36..498210e1f 100644 --- a/divelist.c +++ b/divelist.c @@ -1340,7 +1340,7 @@ static void row_activated_cb(GtkTreeView *tree_view, collapse_expand(tree_view, path); return; } - edit_dive_info(get_dive(index)); + edit_dive_info(get_dive(index), FALSE); } void add_dive_cb(GtkWidget *menuitem, gpointer data) @@ -792,10 +792,11 @@ int edit_multi_dive_info(struct dive *single_dive) return success; } -int edit_dive_info(struct dive *dive) +int edit_dive_info(struct dive *dive, gboolean newdive) { - if (!dive || !amount_selected) + if (!dive || (!newdive && !amount_selected)) return 0; + return edit_multi_dive_info(dive); } @@ -938,7 +939,7 @@ int add_new_dive(struct dive *dive) if (!dive_time_widget(dive)) return 0; - return edit_dive_info(dive); + return edit_dive_info(dive, TRUE); } GtkWidget *extended_dive_info_widget(void) |