- bugfix: accessing profile without loading one when starting an app through the commandline

- bugfix: locked-dialog was disabled

1 files changed, 5 insertions, 1 deletions

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 0f98989c..ce4471a6 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1317,7 +1317,9 @@ HANDLE MainWindow::spawnBinaryDirect(const QFileInfo &binary, const QString &arg
     QCoreApplication::processEvents();
   }
 
-  m_CurrentProfile->writeModlistNow(true);
+  if (m_CurrentProfile != nullptr) {
+    m_CurrentProfile->writeModlistNow(true);
+  }
 
   // TODO: should also pass arguments
   if (m_AboutToRun(binary.absoluteFilePath())) {
@@ -1365,6 +1367,8 @@ void MainWindow::spawnBinary(const QFileInfo &binary, const QString &arguments,
       close();
     } else {
       this->setEnabled(false);
+      // re-enable the locked dialog because what'd be the point otherwise?
+      dialog->setEnabled(true);
 
       QCoreApplication::processEvents();