diff options
| author | Eran Mizrahi <erasmux@gmail.com> | 2017-12-18 02:09:21 +0200 |
|---|---|---|
| committer | Eran Mizrahi <erasmux@gmail.com> | 2017-12-18 20:04:45 +0200 |
| commit | 7dad8bcb282ac385267087961b29af608f81593d (patch) | |
| tree | a9fde3295341b4639f5834e32096bce9ee6b8a33 /src/main.cpp | |
| parent | 302a9b744d1f8edbae5cad910b0153f3c717bd2b (diff) | |
avoid splash screen when running a shortcut
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/main.cpp b/src/main.cpp index 17ef5eba..4cf47a3c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -367,8 +367,6 @@ int runApplication(MOApplication &application, SingleInstance &instance, const QString &splashPath)
{
qDebug("start main application");
- QPixmap pixmap(splashPath);
- QSplashScreen splash(pixmap);
QString dataPath = application.property("dataPath").toString();
qDebug("data path: %s", qPrintable(dataPath));
@@ -382,13 +380,7 @@ int runApplication(MOApplication &application, SingleInstance &instance, try {
qDebug("Working directory: %s", qPrintable(QDir::toNativeSeparators(QDir::currentPath())));
- splash.show();
- } catch (const std::exception &e) {
- reportError(e.what());
- return 1;
- }
- try {
QSettings settings(dataPath + "/"
+ QString::fromStdWString(AppConfig::iniFileName()),
QSettings::IniFormat);
@@ -488,6 +480,10 @@ int runApplication(MOApplication &application, SingleInstance &instance, }
}
+ QPixmap pixmap(splashPath);
+ QSplashScreen splash(pixmap);
+ splash.show();
+
NexusInterface::instance()->getAccessManager()->startLoginCheck();
qDebug("initializing tutorials");
|
