Changeset 19087 in vbox

Timestamp:

Apr 21, 2009 4:29:50 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

46230

Message:

FE/Qt4: 3855: Windows host QT GUI crash when selecting Other in the shared folders path dialog. Second try to fix both issues.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxFilePathSelectorWidget.cpp (modified) (1 diff)
• VBoxGlobal.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFilePathSelectorWidget.cpp

@@ -380 +380 @@
 void VBoxFilePathSelectorWidget::selectPath()
 {
-    /* Clear the focus early to prevent race condition between our and
-     * Qt internal focus out events when opening native modal dialog */
-    clearFocus();
-
     /* Preparing initial directory. */
     QString initDir = mPath.isNull() ? mHomeDir :

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp

@@ -4047 +4047 @@
             bi.lParam = Q_ULONG (&mDir);
 
-            /* Qt is uncapable to properly handle modal state if the modal
-             * window is not a QWidget. For example, if we have the W1->W2->N
-             * ownership where Wx are QWidgets (W2 is modal), and N is a
-             * native modal window, cliking on the title bar of W1 will still
-             * activate W2 and redirect keyboard/mouse to it. The dirty hack
-             * to prevent it is to disable the entire widget... */
-            if (mParent)
-                mParent->setEnabled (false);
-
             LPITEMIDLIST itemIdList = SHBrowseForFolder (&bi);
             if (itemIdList)
@@ -4073 +4064 @@
                 result = QString::null;
             QApplication::postEvent (mTarget, new GetExistDirectoryEvent (result));
-
-            /* Enable the parent widget again. */
-            if (mParent)
-                mParent->setEnabled (true);
         }