Fixed possible crash due to scripts reloading

Added ResetBlocker instances to avoid script reload while a file dialog is open. A ResetBlocker instance was also needed in ScriptDialog::exec, to avoid scripts reloading while a dialog is open in modal mode.
mapeditor · Jul 27, 2023 · 70ea216 · 70ea216
1 parent 22a9901
commit 70ea216
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 22 deletions.
diff --git a/src/tiled/scriptdialog.cpp b/src/tiled/scriptdialog.cpp
@@ -272,6 +272,12 @@ void ScriptDialog::setNewRowMode(NewRowMode mode)
     m_newRowMode = mode;
 }
 
+int ScriptDialog::exec()
+{
+    ScriptManager::ResetBlocker blocker;
+    return QDialog::exec();
+}
+
 QWidget *ScriptDialog::addDialogWidget(QWidget *widget, const QString &label)
 {
     determineWidgetGrouping(widget);

diff --git a/src/tiled/scriptdialog.h b/src/tiled/scriptdialog.h
@@ -90,6 +90,8 @@ class ScriptDialog : public QDialog
     NewRowMode newRowMode() const;
     void setNewRowMode(NewRowMode mode);
 
+    int exec() override;
+
     static void deleteAllDialogs();
 
 private:

diff --git a/src/tiled/scriptmodule.cpp b/src/tiled/scriptmodule.cpp
@@ -597,38 +597,38 @@ QString ScriptModule::prompt(const QString &label, const QString &text, const QS
     ScriptManager::ResetBlocker blocker;
     return QInputDialog::getText(MainWindow::maybeInstance(), title, label, QLineEdit::Normal, text);
 }
+
 QString ScriptModule::promptForDirectory(const QString &defaultDir, const QString &title) const
 {
-    QString finalTitle = QString(title);
-    if (finalTitle.isEmpty())
-        finalTitle = tr("Open Directory");
-    return QFileDialog::getExistingDirectory(MainWindow::maybeInstance(), finalTitle,
-                                                defaultDir,
-                                                QFileDialog::ShowDirsOnly);
+    ScriptManager::ResetBlocker blocker;
+    return QFileDialog::getExistingDirectory(MainWindow::maybeInstance(),
+                                             title.isEmpty() ? tr("Open Directory") : title,
+                                             defaultDir,
+                                             QFileDialog::ShowDirsOnly);
 }
+
 QStringList ScriptModule::promptOpenMultipleFiles(const QString &defaultDir, const QString &filters, const QString &title) const
 {
-    QString finalTitle = QString(title);
-    if (finalTitle.isEmpty())
-        finalTitle = tr("Open Files");
-    return QFileDialog::getOpenFileNames(MainWindow::maybeInstance(), finalTitle,
-                        defaultDir, filters);
+    ScriptManager::ResetBlocker blocker;
+    return QFileDialog::getOpenFileNames(MainWindow::maybeInstance(),
+                                         title.isEmpty() ? tr("Open Files") : title,
+                                         defaultDir, filters);
 }
+
 QString ScriptModule::promptOpenFile(const QString &defaultDir, const QString &filters, const QString &title) const
 {
-    QString finalTitle = QString(title);
-    if (finalTitle.isEmpty())
-        finalTitle = tr("Open File");
-    return QFileDialog::getOpenFileName(MainWindow::maybeInstance(), finalTitle,
-                        defaultDir, filters);
+    ScriptManager::ResetBlocker blocker;
+    return QFileDialog::getOpenFileName(MainWindow::maybeInstance(),
+                                        title.isEmpty() ? tr("Open File") : title,
+                                        defaultDir, filters);
 }
-QString ScriptModule::promptSaveFile(const QString &defaultDir, const QString &filters,  const QString &title) const
+
+QString ScriptModule::promptSaveFile(const QString &defaultDir, const QString &filters, const QString &title) const
 {
-    QString finalTitle = QString(title);
-    if (finalTitle.isEmpty())
-        finalTitle = tr("Save File");
-    return QFileDialog::getSaveFileName(MainWindow::maybeInstance(), finalTitle,
-                        defaultDir, filters);
+    ScriptManager::ResetBlocker blocker;
+    return QFileDialog::getSaveFileName(MainWindow::maybeInstance(),
+                                        title.isEmpty() ? tr("Save File") : title,
+                                        defaultDir, filters);
 }
 
 void ScriptModule::log(const QString &text) const