Properly handles Cancel from engine/rocket browser dialog boxes.

Hypnotoad90 · Aug 22, 2016 · d5cb3bd · d5cb3bd
1 parent 0ad7098
commit d5cb3bd
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/configs.cpp b/configs.cpp
@@ -30,7 +30,10 @@
 void RocketLauncher2::on_button_loadConfigExt_clicked()
 {
     QString settingsDir = QFileDialog::getOpenFileName(this,"Choose where you wish to save the configuration.", QString(),"Rocket Files (*.rocket)");
-    loadExtConfig(settingsDir);
+    if (settingsDir != NULL)
+    {
+        loadExtConfig(settingsDir);
+    }
 }
 
 void RocketLauncher2::initConfigs()

diff --git a/enginesetup.cpp b/enginesetup.cpp
@@ -108,7 +108,11 @@ void RocketLauncher2::on_listbox_engines_clicked(const QModelIndex &index)
 
 void RocketLauncher2::on_button_addCustEng_clicked()
 {
-    enginelist->addDefaultEngine(QFileDialog::getOpenFileName(this, "Locate executable."));
+    QString engine = QFileDialog::getOpenFileName(this, "Locate executable.");
+    if (engine != NULL)
+    {
+        enginelist->addDefaultEngine(engine);
+    }
 }
 
 void RocketLauncher2::on_input_selEngName_returnPressed()

diff --git a/rocketlauncher2.cpp b/rocketlauncher2.cpp
@@ -454,11 +454,14 @@ void RocketLauncher2::on_pushButton_3_clicked() //RUN
 
 void RocketLauncher2::on_pushButton_2_clicked() //Select Engine
 {
-    QFileInfo file = QFileInfo(QFileDialog::getOpenFileName(this,tr("Locate engine executable")));
-    QString result = enginelist->addEngine(file);
-
-    if (result == "Error")
-        QMessageBox::information(this,"Error","Something went wrong, no engine added.");
+    QString engine = QFileDialog::getOpenFileName(this,tr("Locate engine executable"));
+    if (engine != NULL)
+    {
+        QFileInfo file = QFileInfo(engine);
+        QString result = enginelist->addEngine(file);
+            if (result == "Error")
+                QMessageBox::information(this,"Error","Something went wrong, no engine added.");
+    }
 }
 
 void RocketLauncher2::on_combo_Engines_currentIndexChanged(int index)