Changeset 65201 in vbox for trunk/src

Timestamp:

Jan 9, 2017 12:39:39 PM (8 years ago)

Author:

vboxsync

Message:

Main/PerformanceImpl: Invalidate the magic after the timer was destroyed or we risk running into the assertion when the timer kicks in between destroying the magic and destroying the timer which is quite annoying

File:

• trunk/src/VBox/Main/src-server/PerformanceImpl.cpp (modified) (2 diffs)

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

@@ -222 +222 @@
     }
 
-    mMagic = 0;
-
     /* Destroy unregistered metrics */
     BaseMetricList::iterator it;
@@ -246 +244 @@
     AssertMsgRC(vrc, ("Failed to destroy resource usage sampling timer (%Rra)\n", vrc));
     m.sampler = NULL;
+
+    /* Invalidate the magic now. */
+    mMagic = 0;
 
     //delete m.factory;