Changeset 90939 in vbox

Timestamp:

Aug 27, 2021 8:52:21 AM (4 years ago)

Author:

vboxsync

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

146577

Message:

FE/Qt: bugref:10067: UICommon: A bit of rework for s_fCleaningUp stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICommon.cpp (modified) (5 diffs)
• globals/UICommon.h (modified) (4 diffs)
• medium/UIMediumEnumerator.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp

@@ -233 +233 @@
 /* static */
 UICommon *UICommon::s_pInstance = 0;
-bool      UICommon::s_fCleaningUp = false;
 QString   UICommon::s_strLoadedLanguageId = vboxBuiltInLanguageName();
 QString   UICommon::s_strUserDefinedPortName = QString();
@@ -268 +267 @@
     : m_enmType(enmType)
     , m_fValid(false)
+    , m_fCleaningUp(false)
 #ifdef VBOX_WS_WIN
     , m_fDataCommitted(false)
@@ -848 +848 @@
     /* Remember that the cleanup is in progress preventing any unwanted
      * stuff which could be called from the other threads: */
-    s_fCleaningUp = true;
+    m_fCleaningUp = true;
 
 #ifdef VBOX_WS_WIN
@@ -3242 +3242 @@
     AssertReturnVoid(m_fValid);
     /* Ignore the request during UICommon cleanup: */
-    if (s_fCleaningUp)
+    if (m_fCleaningUp)
         return;
     /* Ignore the request during startup snapshot restoring: */
@@ -3266 +3266 @@
     AssertReturnVoid(m_fValid);
     /* Ignore the request during UICommon cleanup: */
-    if (s_fCleaningUp)
+    if (m_fCleaningUp)
         return;
     /* Ignore the request during startup snapshot restoring: */

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.h

@@ -163 +163 @@
     /** @name Common stuff.
      * @{ */
-        /** Returns whether UICommon cleanup is in progress. */
-        static bool isCleaningUp() { return s_fCleaningUp; }
-
         /** Returns Qt runtime version string. */
         static QString qtRTVersionString();
@@ -184 +181 @@
         /** Returns whether UICommon instance is properly initialized. */
         bool isValid() const { return m_fValid; }
+        /** Returns whether UICommon instance cleanup is in progress. */
+        bool isCleaningUp() const { return m_fCleaningUp; }
 
         /** Returns the UI type. */
@@ -861 +860 @@
     /** @name Common stuff.
      * @{ */
-        /** Holds whether UICommon cleanup is in progress. */
-        static bool  s_fCleaningUp;
-
         /** Holds the currently loaded language ID. */
         static QString  s_strLoadedLanguageId;
@@ -875 +871 @@
         /** Holds whether UICommon instance is properly initialized. */
         bool  m_fValid;
+        /** Holds whether UICommon instance cleanup is in progress. */
+        bool  m_fCleaningUp;
 
 #ifdef VBOX_WS_WIN

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumEnumerator.cpp

@@ -189 +189 @@
 
     /* UICommon is cleaning up, abort immediately: */
-    if (UICommon::isCleaningUp())
+    if (uiCommon().isCleaningUp())
         return;
 
@@ -496 +496 @@
     {
         /* If UICommon is cleaning up, abort immediately: */
-        if (UICommon::isCleaningUp())
+        if (uiCommon().isCleaningUp())
             break;