summaryrefslogtreecommitdiffstats
path: root/divelist.c
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2013-04-10 10:04:50 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-04-10 10:04:50 -0700
commit0a9ad49f0aaf45a4d89c4ed90ce2c5c6fab154d5 (patch)
treeed5475718a403e873e19fee9b6cebf780fbf8cd0 /divelist.c
parenta9055049f1486dd18c0b877452a6d5c3b9076fe3 (diff)
downloadsubsurface-0a9ad49f0aaf45a4d89c4ed90ce2c5c6fab154d5.tar.gz
Fix selection handling for invalid dives
This is the downside of having to track our own selection state. We now have a class of dives that potentially isn't known to Gtk as we aren't adding them to the TreeView. So we need to make sure that their selection state is consistent by deselecting them (either when they are marked as invalid OR when we change preferences to no longer show invalid dives). And because Gtk sends out another set of selection events when clearing the TreeView (not sure why), we also need to make sure that their selection state isn't reset to selected by mistake when the divelist is recreated. A bit of a pain, but it seems to work now and be consistent. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'divelist.c')
-rw-r--r--divelist.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/divelist.c b/divelist.c
index 13ed5113f..d105da52e 100644
--- a/divelist.c
+++ b/divelist.c
@@ -852,6 +852,9 @@ void select_dive(int idx)
{
struct dive *dive = get_dive(idx);
if (dive && !dive->selected) {
+ /* never select an invalid dive that isn't displayed */
+ if (dive->dive_tags & DTAG_INVALID && !prefs.display_invalid_dives)
+ return;
dive->selected = 1;
amount_selected++;
selected_dive = idx;