Merge pull request #1611 from rstudio/bugfix/slow-file-dialog

avoid querying clipboard while modal active
rstudio · Oct 16, 2017 · 68aba2d · 68aba2d
2 parents 568985e + 39a30e8
commit 68aba2d
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/cpp/desktop/DesktopGwtCallback.cpp b/src/cpp/desktop/DesktopGwtCallback.cpp
@@ -302,6 +302,11 @@ QString GwtCallback::getExistingDirectory(const QString& caption,
 
 void GwtCallback::onClipboardChanged(QClipboard::Mode mode)
 {
+    // for some reason, Qt can get stalled querying the clipboard
+    // while a modal is active, so disable any such behavior here
+    if (QApplication::activeModalWidget() != NULL)
+       return;
+
     // if this is a change in the selection contents, track it
     if (mode == QClipboard::Selection)
     {