Changeset 54151 in vbox

Timestamp:

Feb 11, 2015 4:53:45 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: 6366: Runtime UI: Handle VBoxSVCAvailabilityChange event (with false availability status) as immediate silent VM power Off.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataManager.cpp (modified) (4 diffs)
• runtime/UIMachineLogic.cpp (modified) (2 diffs)
• runtime/UIMachineLogic.h (modified) (1 diff)
• runtime/UISession.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -1887 +1887 @@
 void UIExtraDataManager::setExtraDataString(const QString &strKey, const QString &strValue, const QString &strID /* = GlobalID */)
 {
+    /* Make sure VBoxSVC is available: */
+    if (!vboxGlobal().isVBoxSVCAvailable())
+        return;
+
     /* Hot-load machine extra-data map if necessary: */
     if (strID != GlobalID && !m_data.contains(strID))
@@ -1937 +1941 @@
 void UIExtraDataManager::setExtraDataStringList(const QString &strKey, const QStringList &strValue, const QString &strID /* = GlobalID */)
 {
+    /* Make sure VBoxSVC is available: */
+    if (!vboxGlobal().isVBoxSVCAvailable())
+        return;
+
     /* Hot-load machine extra-data map if necessary: */
     if (strID != GlobalID && !m_data.contains(strID))
@@ -3637 +3645 @@
 {
     /* Register Main event-listener:  */
-    const CVirtualBox &vbox = vboxGlobal().virtualBox();
+    const CVirtualBox vbox = vboxGlobal().virtualBox();
     ComObjPtr<UIMainEventListenerImpl> pListener;
     pListener.createObject();
@@ -3668 +3676 @@
 void UIExtraDataManager::cleanupMainEventListener()
 {
-    /* Unregister Main event-listener:  */
-    const CVirtualBox &vbox = vboxGlobal().virtualBox();
+    /* Make sure VBoxSVC is available: */
+    if (!vboxGlobal().isVBoxSVCAvailable())
+        return;
+
+    /* Unregister Main event-listener: */
+    const CVirtualBox vbox = vboxGlobal().virtualBox();
     vbox.GetEventSource().UnregisterListener(m_listener);
 }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -427 +427 @@
     /* Notify other listeners: */
     emit sigNotifyAbout3DOverlayVisibilityChange(fVisible);
+}
+
+void UIMachineLogic::sltHandleVBoxSVCAvailabilityChange()
+{
+    /* Handle the VBoxSVC availability change: */
+    if (!vboxGlobal().isVBoxSVCAvailable())
+        powerOff(false);
 }
 
@@ -828 +835 @@
 void UIMachineLogic::prepareSessionConnections()
 {
+    /* We should watch for the VBoxSVC availability changes: */
+    connect(&vboxGlobal(), SIGNAL(sigVBoxSVCAvailabilityChange()),
+            this, SLOT(sltHandleVBoxSVCAvailabilityChange()));
+
     /* We should check for entering/exiting requested modes: */
     connect(uisession(), SIGNAL(sigInitialized()), this, SLOT(sltCheckForRequestedVisualStateType()));

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h

@@ -144 +144 @@
 protected slots:
 
+    /** Handles the VBoxSVC availability change. */
+    void sltHandleVBoxSVCAvailabilityChange();
+
     /** Checks if some visual-state type was requested. */
     virtual void sltCheckForRequestedVisualStateType() {}

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -1464 +1464 @@
 
     /* Close session: */
-    if (!m_session.isNull())
+    if (!m_session.isNull() && vboxGlobal().isVBoxSVCAvailable())
     {
         m_session.UnlockMachine();