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>

1 files changed, 8 insertions, 3 deletions

diff --git a/divelist-gtk.c b/divelist-gtk.c
index f5ed73eb6..ad0f5efe8 100644
--- a/divelist-gtk.c
+++ b/divelist-gtk.c
@@ -1074,9 +1074,6 @@ static void invalid_dives_cb(GtkWidget *menuitem, GtkTreePath *path)
 		return;
 	/* walk the dive list in chronological order */
 	for_each_dive(i, dive) {
-		dive = get_dive(i);
-		if (!dive)
-			continue;
 		if (!dive->selected)
 			continue;
 		/* now swap the invalid tag if just 1 dive was selected
@@ -1093,7 +1090,15 @@ static void invalid_dives_cb(GtkWidget *menuitem, GtkTreePath *path)
 				changed = 1;
 			}
                 }
+		/* if invalid dives aren't shown they need to be
+		 * de-selected here to avoid confusion */
+		if (dive->selected && !prefs.display_invalid_dives) {
+			dive->selected = 0;
+			amount_selected--;
+		}
 	}
+	if (amount_selected == 0)
+		selected_dive = -1;
 	if (changed) {
 		dive_list_update_dives();
 		mark_divelist_changed(TRUE);