summaryrefslogtreecommitdiffstats
path: root/main.cpp
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2013-10-04 11:12:11 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-10-04 11:12:11 -0700
commitf63605e02e4656b60c6c095f4289dbffa293bc2d (patch)
tree93fd7eed42b5893226d75296b8ed1381134b7833 /main.cpp
parent9035e1b53cb97464662343012da47f9cb13a5124 (diff)
parent834800a1794f1ed92f447a2995767ce820473fed (diff)
downloadsubsurface-f63605e02e4656b60c6c095f4289dbffa293bc2d.tar.gz
Merge branch 'bugfixes' of git://github.com/tcanabrava/subsurface
Diffstat (limited to 'main.cpp')
-rw-r--r--main.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/main.cpp b/main.cpp
index a6e39ec53..f12d293d6 100644
--- a/main.cpp
+++ b/main.cpp
@@ -52,9 +52,10 @@ int main(int argc, char **argv)
}
}
if (no_filenames) {
- files.push_back( QString(prefs.default_filename) );
+ QString defaultFile(prefs.default_filename);
+ if (!defaultFile.isEmpty())
+ files.push_back( QString(prefs.default_filename) );
}
-
parse_xml_exit();
subsurface_command_line_exit(&argc, &argv);
mainWindow()->loadFiles(files);