diff options
author | Dirk Hohndel <dirk@hohndel.org> | 2015-06-14 08:32:47 -0700 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2015-06-14 08:32:47 -0700 |
commit | 782d5b36892b720cbe0b6d78310ee3a52094d295 (patch) | |
tree | b3f9c47195e82f1b24bb25f0ec2f6801e7b31524 | |
parent | 10b9202757b1db7f34af5f80c6aafe1ef2fcee88 (diff) | |
download | subsurface-782d5b36892b720cbe0b6d78310ee3a52094d295.tar.gz |
Make default file behavior work as expected
Subsurface will now start with the no default file, the local default file
or cloud storage as chosen in the preferences.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r-- | main.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
@@ -11,6 +11,7 @@ #include "qt-ui/mainwindow.h" #include "qt-ui/diveplanner.h" #include "qt-ui/graphicsview-common.h" +#include "qthelper.h" #include <QStringList> #include <git2.h> @@ -56,9 +57,15 @@ int main(int argc, char **argv) taglist_init_global(); init_ui(); if (no_filenames) { - QString defaultFile(prefs.default_filename); - if (!defaultFile.isEmpty()) - files.push_back(QString(prefs.default_filename)); + if (prefs.default_file_behavior == LOCAL_DEFAULT_FILE) { + QString defaultFile(prefs.default_filename); + if (!defaultFile.isEmpty()) + files.push_back(QString(prefs.default_filename)); + } else if (prefs.default_file_behavior == CLOUD_DEFAULT_FILE) { + QString cloudURL; + if (getCloudURL(cloudURL) == 0) + files.push_back(cloudURL); + } } MainWindow *m = MainWindow::instance(); |