Merge branch 'guiOutputPathFix'

firelab · Dec 13, 2024 · 51119b7 · 51119b7
2 parents d4a6d88 + bc78344
commit 51119b7
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/src/gui/mainWindow.cpp b/src/gui/mainWindow.cpp
@@ -2324,8 +2324,19 @@ int mainWindow::solve()
 
     std::string outputDir = tree->solve->outputDirectory().toStdString();
     if( outputDir == "" ) {
-      // This should never happen, so if it does, fix it.
-      throw( "no output directory specified in solve page" );
+        // This should never happen, so if it does, fix it.
+        progressDialog->cancel();
+        progressDialog->hide();
+        QMessageBox::critical(
+            this, tr("Failure."),
+            tr("no output directory specified in solve page"),
+            QMessageBox::Ok | QMessageBox::Default);
+        disconnect(progressDialog, SIGNAL(canceled()), this,
+                SLOT(cancelSolve()));
+        setCursor(Qt::ArrowCursor);
+        tree->weather->checkForModelData();
+        delete army;
+        return false;
     }
 
     //fill in the values

diff --git a/src/gui/solvePage.cpp b/src/gui/solvePage.cpp
@@ -105,9 +105,12 @@ void solvePage::setOutputDir(QString dir) {
 }
 
 void solvePage::chooseOutputDir() {
-  QString start = QFileInfo( outputDirLineEdit->text() ).absolutePath();
   QString dir = QFileDialog::getExistingDirectory( this,
-    tr("Open Output Directory"), start, QFileDialog::ShowDirsOnly );
+    tr("Open Output Directory"), outputDirLineEdit->text(), QFileDialog::ShowDirsOnly );
+  if( dir == "" )
+  {
+    dir = outputDirLineEdit->text();
+  }
   outputDirLineEdit->setText( dir );
 }