]> git.tdb.fi Git - ext/subsurface.git/commitdiff
Fix import tracking
authorDirk Hohndel <dirk@hohndel.org>
Wed, 5 Oct 2011 21:09:49 +0000 (14:09 -0700)
committerDirk Hohndel <dirk@hohndel.org>
Wed, 5 Oct 2011 21:09:49 +0000 (14:09 -0700)
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>
main.c

diff --git a/main.c b/main.c
index 26d2eee220bcbdcc8b4d4096aeadee336a025178..ee09b9a82e50b4ee0bceda0ef9eebdd7cadaae64 100644 (file)
--- 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;