Changeset 78758 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

May 26, 2019 3:07:17 AM (6 years ago)

Author:

vboxsync

Message:

Main/GuestSession::i_startSessionAsync: Simplified the code a little. bugref:9320

File:

• trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp

@@ -2008 +2008 @@
     LogFlowThisFuncEnter();
 
-    int vrc;
-    GuestSessionTaskInternalStart* pTask = NULL;
+    /* Create task: */
+    GuestSessionTaskInternalStart *pTask = NULL;
     try
     {
         pTask = new GuestSessionTaskInternalStart(this);
-        if (!pTask->isOk())
-        {
-            delete pTask;
-            LogFlow(("GuestSession: Could not create GuestSessionTaskInternalStart object\n"));
-            throw VERR_MEMOBJ_INIT_FAILED;
-        }
-
-        /* Asynchronously open the session on the guest by kicking off a worker thread. */
-        /* Note: This function deletes pTask in case of exceptions, so there is no need in the call of delete operator. */
+    }
+    catch (std::bad_alloc &)
+    {
+        return VERR_NO_MEMORY;
+    }
+    if (pTask->isOk())
+    {
+        /* Kick off the thread: */
         HRESULT hrc = pTask->createThread();
-        vrc = Global::vboxStatusCodeFromCOM(hrc);
-    }
-    catch(std::bad_alloc &)
-    {
-        vrc = VERR_NO_MEMORY;
-    }
-    catch(int eVRC)
-    {
-        vrc = eVRC;
-        LogFlow(("GuestSession: Could not create thread for GuestSessionTaskInternalOpen task %Rrc\n", vrc));
-    }
-
-    LogFlowFuncLeaveRC(vrc);
-    return vrc;
+        pTask = NULL; /* Not valid anymore, not even on failure! */
+        if (SUCCEEDED(hrc))
+        {
+            LogFlowFuncLeaveRC(VINF_SUCCESS);
+            return VINF_SUCCESS;
+        }
+        LogFlow(("GuestSession: Failed to create thread for GuestSessionTaskInternalOpen task.\n"));
+    }
+    else
+        LogFlow(("GuestSession: GuestSessionTaskInternalStart creation failed: %Rhrc.\n", pTask->rc()));
+    LogFlowFuncLeaveRC(VERR_GENERAL_FAILURE);
+    return VERR_GENERAL_FAILURE;
 }