Changeset 94713 in vbox

Timestamp:

Apr 27, 2022 7:25:52 AM (3 years ago)

Author:

vboxsync

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

151092

Message:

Main/Update check: Fixes for event handling. bugref:7983

File:

• trunk/src/VBox/Main/src-server/UpdateAgentImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/src-server/UpdateAgentImpl.cpp

@@ -290 +290 @@
 HRESULT UpdateAgent::init(VirtualBox *aVirtualBox)
 {
-    // Enclose the state transition NotReady->InInit->Ready.
-    AutoInitSpan autoInitSpan(this);
-    AssertReturn(autoInitSpan.isOk(), E_FAIL);
-
     /* Weak reference to a VirtualBox object */
     unconst(m_VirtualBox) = aVirtualBox;
@@ -299 +295 @@
     HRESULT hr = unconst(m_EventSource).createObject();
     if (SUCCEEDED(hr))
-    {
         hr = m_EventSource->init();
-        if (SUCCEEDED(hr))
-            autoInitSpan.setSucceeded();
-    }
 
     return hr;
@@ -751 +743 @@
     ::FireUpdateAgentErrorEvent(m_EventSource, psz, vrc);
 
-    HRESULT const rc = setErrorVrc(VERR_COM_IPRT_ERROR /** @todo Translate HTTP errors to COM? */, pcszMsgFmt, va);
+    HRESULT const rc = setErrorVrc(VERR_COM_IPRT_ERROR /** @todo Translate HTTP errors to COM? */, psz);
 
     va_end(va);
@@ -790 +782 @@
     AutoInitSpan autoInitSpan(this);
     AssertReturn(autoInitSpan.isOk(), E_FAIL);
-
-    /* Weak reference to a VirtualBox object */
-    unconst(m_VirtualBox) = aVirtualBox;
 
     /* Initialize the bare minimum to get things going.
@@ -802 +791 @@
     m->strRepoUrl = "https://update.virtualbox.org";
 
-    autoInitSpan.setSucceeded();
-    return S_OK;
+    HRESULT hr = UpdateAgent::init(aVirtualBox);
+    if (SUCCEEDED(hr))
+        autoInitSpan.setSucceeded();
+
+    return hr;
 }