mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove all the no longer necessary code that aborts read of first V2 file

Browse source 
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>
This commit is contained in:
Dirk Hohndel 2015-06-16 12:52:39 -07:00
parent bd11988f74
commit ccc9d80015
9 changed files with 4 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

9
file.c
View file

@ -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;