diff options
author | Dirk Hohndel <dirk@hohndel.org> | 2013-04-07 09:08:49 -0700 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2013-04-07 09:08:49 -0700 |
commit | 387dbe510f14ac5590075544431bbedf1e44fb2f (patch) | |
tree | a20b4b7fd4686e5bdb060d015580ea70fa31478c /file.c | |
parent | eba62d3cf138854625ec95b75bdd55a35e5217a0 (diff) | |
parent | 07c08eafac3eccc9b7360011fd9a19904160351c (diff) | |
download | subsurface-387dbe510f14ac5590075544431bbedf1e44fb2f.tar.gz |
Merge branch 'cleanup-from-Qt-branch' of github.com:henrik242/subsurface
Diffstat (limited to 'file.c')
-rw-r--r-- | file.c | 12 |
1 files changed, 1 insertions, 11 deletions
@@ -263,7 +263,7 @@ static void parse_file_buffer(const char *filename, struct memblock *mem, GError parse_xml_buffer(filename, mem->buffer, mem->size, &dive_table, error); } -void parse_file(const char *filename, GError **error, gboolean possible_default_filename) +void parse_file(const char *filename, GError **error) { struct memblock mem; #ifdef SQLITE3 @@ -283,19 +283,9 @@ void parse_file(const char *filename, GError **error, gboolean possible_default_ filename); } - /* - * We do *not* want to leave the old default_filename - * just because the open failed. - */ - if (possible_default_filename) - set_filename(filename, TRUE); - return; } - if (possible_default_filename) - set_filename(filename, TRUE); - #ifdef SQLITE3 fmt = strrchr(filename, '.'); if (fmt && (!strcasecmp(fmt + 1, "DB") || !strcasecmp(fmt + 1, "BAK"))) { |