summaryrefslogtreecommitdiffstats
path: root/file.c
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2015-06-16 12:52:39 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-06-16 14:41:56 -0700
commitccc9d800153ad11d8a2b54dc75fe8aefb5650dd3 (patch)
tree31a3638cd0885515709ab2aa55a3499746a1d2a8 /file.c
parentbd11988f74d2fcc7873df691e06a1279d7fd3228 (diff)
downloadsubsurface-ccc9d800153ad11d8a2b54dc75fe8aefb5650dd3.tar.gz
Remove all the no longer necessary code that aborts read of first V2 file
This was a poorly implemented hack when we executed the reverse geo lookup in the main thread and opening a V2 file could take a very long time. We need to do the "Welcome" message quite differently. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'file.c')
-rw-r--r--file.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/file.c b/file.c
index a9d5703cb..6eb98d5b4 100644
--- a/file.c
+++ b/file.c
@@ -1168,16 +1168,7 @@ int parse_manual_file(const char *filename, int sepidx, int units, int dateforma
if (try_to_xslt_open_csv(filename, &mem, "manualCSV"))
return -1;
- // right now input files created by XSLT processing report being v2 XML which makes
- // the parse function abort until the dialog about importing v2 files has been shown.
- // Until the XSLT has been updated we just override this check
- //
- // FIXME
- //
- bool remember = v2_question_shown;
- v2_question_shown = true;
ret = parse_xml_buffer(filename, mem.buffer, mem.size, &dive_table, (const char **)params);
- v2_question_shown = remember;
free(mem.buffer);
return ret;