From: Dirk Hohndel <dirk@hohndel.org>
Date: Wed, 5 Oct 2011 21:09:49 +0000 (-0700)
Subject: Fix import tracking
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=6231b64d3de47dde9420d35ea7e6d620a3a2b966;p=ext%2Fsubsurface.git

Fix import tracking

Minor logical flaw that breaks the model.
When the --import parameter is found we need to mark that the FOLLOWING
dives are imported, not the ones loaded so far.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---

diff --git a/main.c b/main.c
index 26d2eee..ee09b9a 100644
--- a/main.c
+++ b/main.c
@@ -97,6 +97,11 @@ static void try_to_renumber(struct dive *last, int preexisting)
 	}
 }
 
+/*
+ * track whether we switched to importing dives
+ */
+static gboolean imported = FALSE;
+
 /*
  * This doesn't really report anything at all. We just sort the
  * dives, the GUI does the reporting
@@ -162,7 +167,8 @@ static void parse_argument(const char *arg)
 			if (strcmp(arg,"--import") == 0) {
 				/* mark the dives so far as the base,
 				 * everything after is imported */
-				report_dives(TRUE);
+				report_dives(FALSE);
+				imported = TRUE;
 				return;
 			}
 			/* fallthrough */
@@ -229,7 +235,7 @@ int main(int argc, char **argv)
 		}
 	}
 
-	report_dives(FALSE);
+	report_dives(imported);
 
 	run_ui();
 	return 0;