Changeset 90939 in vbox for trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp

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.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp (modified) (5 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: */