- bugfix: MO crashed without error message when "bootstrapping" failed

1 files changed, 17 insertions, 11 deletions

diff --git a/src/main.cpp b/src/main.cpp
index 549de4a9..295fb75a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -369,23 +369,29 @@ int main(int argc, char *argv[])
     return 1;

   }

 

-  if (!bootstrap()) { // requires gameinfo to be initialised!

-    return -1;

-  }

+  QPixmap pixmap(":/MO/gui/splash");

+  QSplashScreen splash(pixmap);

+

+  try {

+    if (!bootstrap()) { // requires gameinfo to be initialised!

+      return -1;

+    }

 

-  LogBuffer::init(100, QtDebugMsg, qApp->property("dataPath").toString() + "/logs/mo_interface.log");

+    LogBuffer::init(100, QtDebugMsg, qApp->property("dataPath").toString() + "/logs/mo_interface.log");

 

 #if QT_VERSION >= 0x050000

-  qDebug("ssl support: %d", QSslSocket::supportsSsl());

+    qDebug("ssl support: %d", QSslSocket::supportsSsl());

 #endif

 

-  qDebug("Working directory: %s", qPrintable(QDir::toNativeSeparators(QDir::currentPath())));

-  qDebug("MO at: %s", qPrintable(QDir::toNativeSeparators(application.applicationDirPath())));

-  QPixmap pixmap(":/MO/gui/splash");

-  QSplashScreen splash(pixmap);

-  splash.show();

+    qDebug("Working directory: %s", qPrintable(QDir::toNativeSeparators(QDir::currentPath())));

+    qDebug("MO at: %s", qPrintable(QDir::toNativeSeparators(application.applicationDirPath())));

+    splash.show();

 

-  cleanupDir();

+    cleanupDir();

+  } catch (const std::exception &e) {

+    reportError(e.what());

+    return 1;

+  }

 

   { // extend path to include dll directory so plugins don't need a manifest

     // (using AddDllDirectory would be an alternative to this but it seems fairly complicated esp.