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

Timestamp:

Oct 13, 2014 6:02:36 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI rework/cleanup for 7115 (part #19): Better encapsulation for UISession (part #3): Forgot to handle few additional cases in r96542.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp (modified) (1 diff)

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

@@ -379 +379 @@
 bool UISession::restoreCurrentSnapshot()
 {
-    /* Search for corresponding VM: */
-    CVirtualBox vbox = vboxGlobal().virtualBox();
-    const QString strMachineID = vboxGlobal().managedVMUuid();
-    const CMachine mach = vbox.FindMachine(strMachineID);
-    if (vbox.isOk() && !mach.isNull())
-    {
+    /* Prepare result: */
+    bool fResult = false;
+
+    /* Simulate try-catch block: */
+    do
+    {
+        /* Search for corresponding VM: */
+        CVirtualBox vbox = vboxGlobal().virtualBox();
+        const QString strMachineID = vboxGlobal().managedVMUuid();
+        const CMachine mach = vbox.FindMachine(strMachineID);
+        if (!vbox.isOk() || mach.isNull())
+        {
+            /* Unable to find VM: */
+            msgCenter().cannotFindMachineById(vbox, strMachineID);
+            break;
+        }
+
         /* Open a direct session to modify that VM: */
         CSession sess = vboxGlobal().openSession(vboxGlobal().managedVMUuid(),
                                                  vboxGlobal().isSeparateProcess()
                                                  ? KLockType_Write : KLockType_Shared);
-        if (!sess.isNull())
+        if (sess.isNull())
+        {
+            /* Unable to open session: */
+            break;
+        }
+
+        /* Simulate try-catch block: */
+        do
         {
             /* Acquire console for this session: */
             CConsole cons = sess.GetConsole();
-            if (!cons.isNull())
+            if (cons.isNull())
             {
-                /* Prepare the snapshot-discard progress: */
-                const CSnapshot snap = mach.GetCurrentSnapshot();
-                CProgress prog = cons.RestoreSnapshot(snap);
-                if (cons.isOk())
-                {
-                    /* Show snapshot restoration progress: */
-                    msgCenter().showModalProgressDialog(prog, mach.GetName(), ":/progress_snapshot_discard_90px.png");
-                    if (prog.GetResultCode() != 0)
-                    {
-                        /* Unable to restore snapshot: */
-                        msgCenter().cannotRestoreSnapshot(prog, snap.GetName(), mach.GetName());
-                    }
-                }
-                else
-                {
-                    /* Unable to restore snapshot: */
-                    return msgCenter().cannotRestoreSnapshot(cons, snap.GetName(), machineName());
-                }
+                /* Unable to acquire console: */
+                break;
             }
-            /* Unlock machine finally: */
-            sess.UnlockMachine();
-        }
-        else
-        {
-            /* Unable to open session to modify VM: */
-            return false;
-        }
-    }
-    else
-    {
-        /* Unable to find VM: */
-        msgCenter().cannotFindMachineById(vbox, strMachineID);
-        return false;
-    }
+
+            /* Prepare the snapshot-discard progress: */
+            const CSnapshot snap = mach.GetCurrentSnapshot();
+            CProgress prog = cons.RestoreSnapshot(snap);
+            if (!cons.isOk() || prog.isNull())
+            {
+                /* Unable to restore snapshot: */
+                msgCenter().cannotRestoreSnapshot(cons, snap.GetName(), machineName());
+                break;
+            }
+
+            /* Show the snapshot-discard progress: */
+            msgCenter().showModalProgressDialog(prog, mach.GetName(), ":/progress_snapshot_discard_90px.png");
+            if (prog.GetResultCode() != 0)
+            {
+                /* Unable to restore snapshot: */
+                msgCenter().cannotRestoreSnapshot(prog, snap.GetName(), mach.GetName());
+                break;
+            }
+
+            /* Success: */
+            fResult = true;
+        }
+        while (0);
+
+        /* Unlock machine finally: */
+        sess.UnlockMachine();
+    }
+    while (0);
+
+    /* Return result: */
+    return fResult;
 }