From 7dad8bcb282ac385267087961b29af608f81593d Mon Sep 17 00:00:00 2001
From: Eran Mizrahi <erasmux@gmail.com>
Date: Mon, 18 Dec 2017 02:09:21 +0200
Subject: avoid splash screen when running a shortcut

---
 src/main.cpp | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'src/main.cpp')

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");
-- 
cgit v1.3.1