auto-dismiss existing modal dialog before showing message box

rstudio · Feb 8, 2013 · 0e7a4d8 · 0e7a4d8
1 parent dc2e866
commit 0e7a4d8
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/cpp/desktop/DesktopGwtCallback.cpp b/src/cpp/desktop/DesktopGwtCallback.cpp
@@ -485,6 +485,11 @@ int GwtCallback::showMessageBox(int type,
    if (pUpdateDialog != NULL)
       pUpdateDialog->close();
 
+   // cancel other message box if it's visible
+   QMessageBox* pMsgBox = qobject_cast<QMessageBox*>(
+                        QApplication::activeModalWidget());
+   if (pMsgBox != NULL)
+      pMsgBox->close();
 
    QMessageBox msgBox(safeMessageBoxIcon(static_cast<QMessageBox::Icon>(type)),
                        caption,