Changeset 46599 in vbox for trunk

Timestamp:

Jun 17, 2013 3:52:39 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: More strict VRDE server enable/disable error handling.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachineLogic.cpp (modified) (3 diffs)
• UIMachineLogic.h (modified) (1 diff)

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

@@ -810 +810 @@
             this, SLOT(sltOpenSharedFoldersDialog()));
     connect(gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer), SIGNAL(toggled(bool)),
-            this, SLOT(sltSwitchVrde(bool)));
+            this, SLOT(sltToggleVRDE(bool)));
     connect(gActionPool->action(UIActionIndexRuntime_Toggle_VideoCapture), SIGNAL(toggled(bool)),
             this, SLOT(sltToggleVideoCapture(bool)));
@@ -1890 +1890 @@
 }
 
-void UIMachineLogic::sltSwitchVrde(bool fOn)
-{
-    /* Prepare variables: */
+void UIMachineLogic::sltToggleVRDE(bool fEnabled)
+{
+    /* Do not process if window(s) missed! */
+    if (!isMachineWindowsCreated())
+        return;
+
+    /* Access VRDE server: */
     CMachine machine = session().GetMachine();
     CVRDEServer server = machine.GetVRDEServer();
-    AssertMsg(!server.isNull(), ("VRDE server should not be null!\n"));
-
-    /* Toggle VRDE server state: */
-    server.SetEnabled(fOn);
-    if (!server.isOk())
-    {
-        /* Notify about the error: */
-        msgCenter().cannotToggleVRDEServer(server, machine.GetName(), fOn);
-        /* Make sure action is updated! */
-        uisession()->updateStatusVRDE();
+    AssertMsg(!server.isNull(), ("VRDE server should NOT be null!\n"));
+    if (!machine.isOk() || server.isNull())
+        return;
+
+    /* Make sure something had changed: */
+    if (server.GetEnabled() == static_cast<BOOL>(fEnabled))
+        return;
+
+    /* Server is OK? */
+    if (server.isOk())
+    {
+        /* Update VRDE server state: */
+        server.SetEnabled(fEnabled);
+        /* Server still OK? */
+        if (server.isOk())
+        {
+            /* Save machine-settings: */
+            machine.SaveSettings();
+            /* Machine still OK? */
+            if (!machine.isOk())
+            {
+                /* Notify about the error: */
+                msgCenter().cannotSaveMachineSettings(machine);
+                /* Make sure action is updated! */
+                uisession()->updateStatusVRDE();
+            }
+        }
+        else
+        {
+            /* Notify about the error: */
+            msgCenter().cannotToggleVRDEServer(server, machine.GetName(), fEnabled);
+            /* Make sure action is updated! */
+            uisession()->updateStatusVRDE();
+        }
     }
 }
@@ -1933 +1961 @@
     /* Machine had failed on one of steps? */
     if (!machine.isOk())
-        msgCenter().cannotSaveMachineSettings(machine, activeMachineWindow());
+        msgCenter().cannotSaveMachineSettings(machine);
 }
 

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

@@ -205 +205 @@
     void sltPrepareDragAndDropMenu();
     void sltChangeDragAndDropType(QAction *pAction);
-    void sltSwitchVrde(bool fOn);
+    void sltToggleVRDE(bool fEnabled);
     void sltToggleVideoCapture(bool fEnabled);
     void sltOpenVideoCaptureOptions();