Changeset 70909 in vbox

Timestamp:

Feb 8, 2018 12:13:04 PM (7 years ago)

Author:

vboxsync

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

120737

Message:

FE/Qt bugref:6699 Don't try to unregister an invalid event listener

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIGuestSessionsEventHandler.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIGuestSessionsEventHandler.cpp

@@ -212 +212 @@
     if (!vboxGlobal().isVBoxSVCAvailable())
         return;
-
-    CEventSource comEventSourceGuestProcess = m_comGuestProcess.GetEventSource();
-    AssertWrapperOk(comEventSourceGuestProcess);
-    comEventSourceGuestProcess.UnregisterListener(m_comEventListener);
+    if(m_comGuestProcess.isOk())
+    {
+        CEventSource comEventSourceGuestProcess = m_comGuestProcess.GetEventSource();
+        if(comEventSourceGuestProcess.isOk())
+        {
+            AssertWrapperOk(comEventSourceGuestProcess);
+            comEventSourceGuestProcess.UnregisterListener(m_comEventListener);
+        }
+    }
 }
 
@@ -357 +362 @@
         return;
 
-    /* Get CGuestSession event source: */
-    CEventSource comEventSourceGuestSession = m_comGuestSession.GetEventSource();
-    AssertWrapperOk(comEventSourceGuestSession);
-
-    /* Unregister event listener for CProgress event source: */
-    comEventSourceGuestSession.UnregisterListener(m_comEventListener);
+    if (m_comGuestSession.isOk())
+    {
+        /* Get CGuestSession event source: */
+        CEventSource comEventSourceGuestSession = m_comGuestSession.GetEventSource();
+        if (comEventSourceGuestSession.isOk())
+        {
+            AssertWrapperOk(comEventSourceGuestSession);
+
+            /* Unregister event listener for CProgress event source: */
+            comEventSourceGuestSession.UnregisterListener(m_comEventListener);
+        }
+    }
 }
 
@@ -608 +619 @@
     const GuestSessionMap& guestSessionMap = m_pPrivateImp->getGuestSessionMap();
     QStringList itemStringList;
+
     for (GuestSessionMap::const_iterator iterator = guestSessionMap.begin();
         iterator != guestSessionMap.end(); ++iterator)