[Bugfix]Gui: ensure message boxes appear and stay on top of main window

FreeCAD · Sep 5, 2022 · b687e2c · b687e2c
1 parent c35244e
commit b687e2c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Gui/DlgMacroExecuteImp.cpp b/src/Gui/DlgMacroExecuteImp.cpp
@@ -409,7 +409,7 @@ void DlgMacroExecuteImp::on_deleteButton_clicked()
     MacroItem * mitem = static_cast<MacroItem *>(item);
 
     if (mitem->systemWide) {
-        QMessageBox::critical(qApp->activeWindow(), QObject::tr("Delete macro"),
+        QMessageBox::critical(Gui::getMainWindow(), QObject::tr("Delete macro"),
             QObject::tr("Not allowed to delete system-wide macros"));
         return;
     }

diff --git a/src/Mod/Sketcher/Gui/EditDatumDialog.cpp b/src/Mod/Sketcher/Gui/EditDatumDialog.cpp
@@ -77,7 +77,7 @@ void EditDatumDialog::exec(bool atCursor)
     if (Constr->isDimensional()) {
 
         if (sketch->hasConflicts()) {
-            QMessageBox::critical(qApp->activeWindow(), QObject::tr("Distance constraint"),
+            QMessageBox::critical(Gui::getMainWindow(), QObject::tr("Distance constraint"),
                                   QObject::tr("Not allowed to edit the datum because the sketch contains conflicting constraints"));
             return;
         }
@@ -216,7 +216,7 @@ void EditDatumDialog::accepted()
             tryAutoRecompute(sketch);
         }
         catch (const Base::Exception& e) {
-            QMessageBox::critical(qApp->activeWindow(), QObject::tr("Dimensional constraint"), QString::fromUtf8(e.what()));
+            QMessageBox::critical(Gui::getMainWindow(), QObject::tr("Dimensional constraint"), QString::fromUtf8(e.what()));
             Gui::Command::abortCommand();
 
             if(sketch->noRecomputes) // if setdatum failed, it is highly likely that solver information is invalid.