Changeset 14585 in vbox for trunk/src/VBox/Frontends

Timestamp:

Nov 25, 2008 5:51:45 PM (16 years ago)

Author:

vboxsync

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

39885

Message:

Fe/Qt4: Systray: Fixed assertions.

File:

• trunk/src/VBox/Frontends/VirtualBox4/src/VBoxGlobal.cpp (modified) (2 diffs)

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

@@ -1346 +1346 @@
 VBoxSelectorWnd &VBoxGlobal::selectorWnd()
 {
-#if defined (VBOX_GUI_SEPARATE_VM_PROCESS)
-    AssertMsg (!vboxGlobal().isVMConsoleProcess(),
-               ("Must NOT be a VM console process"));
-#endif
-
     Assert (mValid);
 
@@ -1420 +1415 @@
         return false;
 
-    AssertMsg (vboxGlobal().mainWindow(),
-               ("Main window must not be null for systray!"));
+    AssertMsg (&vboxGlobal().selectorWnd(),
+               ("Selector window must not be null for systray!"));
 
     mVBox.SetExtraData (VBoxDefs::GUI_TrayIconWinID,
-                        QString ("%1").arg ((qulonglong) vboxGlobal().mainWindow()->winId()));
+                        QString ("%1").arg ((qulonglong) vboxGlobal().selectorWnd().winId()));
 
     /* The first process which can grab this "mutex" will win ->