diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2012-09-20 13:33:00 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2012-09-20 13:33:00 -0700 |
| commit | 7e8a4760100ae091a5692285cc4b5da1f005b617 (patch) | |
| tree | 9c4689c50f08608a18372e00ccfaed5c272253f2 /divelist.c | |
| parent | c9bb617a85cd4a340f7d07eea78af5e12d7a8a9b (diff) | |
| download | subsurface-7e8a4760100ae091a5692285cc4b5da1f005b617.tar.gz | |
Removed obsolete debug message
We now handle this case correctly, so don't alert the user to something
that isn't an issue at all.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'divelist.c')
| -rw-r--r-- | divelist.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/divelist.c b/divelist.c index b95dc86c3..4f6808b1b 100644 --- a/divelist.c +++ b/divelist.c @@ -1177,10 +1177,6 @@ static void fill_dive_list(void) trip = find_matching_trip(dive->when); if (trip) dive_trip = DIVE_TRIP(trip); - else - printf ("data seems inconsistent - dive claims to be in dive trip " - "yet there appears to be no matching trip\n" - "Trying to recover\n"); } else { /* dive is not in a trip and we aren't autogrouping */ dive_trip = NULL; @@ -1538,6 +1534,9 @@ static void merge_dive_into_trip_above_cb(GtkWidget *menuitem, GtkTreePath *path /* add the dive to the trip */ for (;;) { dive->divetrip = prev_dive->divetrip; + /* we intentionally changed the dive_trip, so update the time + * stamp that we fall back to when toggling autogroup */ + dive->divetrip->when_from_file = dive->divetrip->when; dive->tripflag = IN_TRIP; (void)move_dive_between_trips(&dive_iter, NULL, &trip_iter, NULL, TRUE); prev_dive = dive; |