Changeset 11666 in vbox

Timestamp:

Aug 26, 2008 3:10:34 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: Fix crash if vdm is started from the menu. Make the vdm initial centered to the parent.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxDiskImageManagerDlg.h (modified) (1 diff)
• src/VBoxDiskImageManagerDlg.cpp (modified) (3 diffs)
• src/VBoxSelectorWnd.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxDiskImageManagerDlg.h

@@ -48 +48 @@
 
     void setup (int aType, bool aDoSelect, const QUuid &aTargetVMId = QUuid(),
-                bool aRefresh = true, CMachine aMachine = 0,
+                bool aRefresh = true, CMachine aMachine = CMachine(),
                 const QUuid &aHdId = QUuid(),
                 const QUuid &aCdId = QUuid(),
                 const QUuid &aFdId = QUuid());
 
-    static void showModeless (bool aRefresh = true);
+    static void showModeless (QWidget *aParent = NULL, bool aRefresh = true);
 
     QUuid selectedUuid() const;

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxDiskImageManagerDlg.cpp

@@ -407 +407 @@
 
 void VBoxDiskImageManagerDlg::setup (int aType, bool aDoSelect,
-                                     const QUuid &aTargetVMId /* = 0 */,
+                                     const QUuid &aTargetVMId /* = QUuid() */,
                                      bool aRefresh /* = true */,
-                                     CMachine aMachine /* = 0 */,
+                                     CMachine aMachine /* = CMachine() */,
                                      const QUuid &aHdId,
                                      const QUuid &aCdId,
@@ -490 +490 @@
 
 /* static */
-void VBoxDiskImageManagerDlg::showModeless (bool aRefresh /* = true */)
+void VBoxDiskImageManagerDlg::showModeless (QWidget *aParent /* = NULL */, bool aRefresh /* = true */)
 {
     if (!mModelessDialog)
     {
         mModelessDialog =
-            new VBoxDiskImageManagerDlg (0, Qt::Window);
+            new VBoxDiskImageManagerDlg (aParent, Qt::Window);
         mModelessDialog->setAttribute (Qt::WA_DeleteOnClose);
         mModelessDialog->setup (VBoxDefs::HD | VBoxDefs::CD | VBoxDefs::FD,
-                                false, 0, aRefresh);
+                                false, QUuid(), aRefresh);
 
         /* listen to events that may change the media status and refresh
@@ -1448 +1448 @@
 
     bool notInEnum      = !vboxGlobal().isMediaEnumerationStarted();
+    /* If we are currently enumerating the media go out of here. We are coming
+     * back here from the finished signal. */
+    if (!notInEnum)
+        return;
     bool modifyEnabled  = notInEnum &&
                           item &&  item->usage().isNull() &&

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxSelectorWnd.cpp

@@ -745 +745 @@
 void VBoxSelectorWnd::fileDiskMgr()
 {
-    VBoxDiskImageManagerDlg::showModeless();
+    VBoxDiskImageManagerDlg::showModeless (this);
 }
 
@@ -1461 +1461 @@
             /* Show the VDM dialog but don't refresh once more after a
              * just-finished refresh */
-            /* Todo: Changed this to true to temporary fix #3000 comment 4.
-             * We have to find the real trouble here. */
-//            VBoxDiskImageManagerDlg::showModeless (false /* aRefresh */);
-            VBoxDiskImageManagerDlg::showModeless (true /* aRefresh */);
+            VBoxDiskImageManagerDlg::showModeless (this, false /* aRefresh */);
         }
     }