Changeset 15610 in vbox for trunk/src/VBox

Timestamp:

Dec 16, 2008 10:01:58 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: Make sure the settings files are checked for the auto-conversion really before other code gets any chance to unconditionally save them w/o backing up.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxGlobal.h (modified) (1 diff)
• src/VBoxGlobal.cpp (modified) (5 diffs)
• src/main.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxGlobal.h

@@ -1051 +1051 @@
 
 #ifdef VBOX_GUI_WITH_SYSTRAY
-    bool mIsTrayMenu;           /* Tray icon active/desired? */
+    bool mIsTrayMenu : 1; /*< Tray icon active/desired? */
+    bool mIncreasedWindowCounter : 1;
 #endif
+
     QThread *mMediaEnumThread;
     VBoxMediaList mMediaList;

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxGlobal.cpp

@@ -1256 +1256 @@
 #ifdef VBOX_GUI_WITH_SYSTRAY
     , mIsTrayMenu (false)
+    , mIncreasedWindowCounter (false)
 #endif
     , mMediaEnumThread (NULL)
@@ -5305 +5306 @@
     }
 
+    /* create default non-null global settings */
+    gset = VBoxGlobalSettings (false);
+
+    /* try to load global settings */
+    gset.load (mVBox);
+    if (!mVBox.isOk() || !gset)
+    {
+        vboxProblem().cannotLoadGlobalConfig (mVBox, gset.lastError());
+        return;
+    }
+
+    /* Load the customized language as early as possible to get possible error
+     * messages translated */
+    QString languageId = gset.languageId();
+    if (!languageId.isNull())
+        loadLanguage (languageId);
+
+    retranslateUi();
+
+    /* Note: the settings conversion check must be done before anything else
+     * that may unconditionally overwrite settings files in the new format (like
+     * SetExtraData()). But after loading the proper the language. */
+    if (!checkForAutoConvertedSettings())
+        return;
+
 #ifdef VBOX_GUI_WITH_SYSTRAY
-    /* Increase open Fe/Qt4 windows reference count. */
-    int c = mVBox.GetExtraData (VBoxDefs::GUI_MainWindowCount).toInt() + 1;
-    AssertMsg ((c>=0) || (mVBox.isOk()),
-        ("Something went wrong with the window reference count!"));
-    mVBox.SetExtraData (VBoxDefs::GUI_MainWindowCount, QString ("%1").arg (c));
+    {
+        /* Increase open Fe/Qt4 windows reference count. */
+        int c = mVBox.GetExtraData (VBoxDefs::GUI_MainWindowCount).toInt() + 1;
+        AssertMsgReturnVoid ((c >= 0) || (mVBox.isOk()),
+            ("Something went wrong with the window reference count!"));
+        mVBox.SetExtraData (VBoxDefs::GUI_MainWindowCount, QString ("%1").arg (c));
+        mIncreasedWindowCounter = mVBox.isOk();
+        AssertReturnVoid (mIncreasedWindowCounter);
+    }
 #endif
 
@@ -5467 +5497 @@
     qApp->installEventFilter (this);
 
-    /* create default non-null global settings */
-    gset = VBoxGlobalSettings (false);
-
-    /* try to load global settings */
-    gset.load (mVBox);
-    if (!mVBox.isOk() || !gset)
-    {
-        vboxProblem().cannotLoadGlobalConfig (mVBox, gset.lastError());
-        return;
-    }
-
-    /* Load customized language if any */
-    QString languageId = gset.languageId();
-    if (!languageId.isNull())
-        loadLanguage (languageId);
-
-    retranslateUi();
-
     /* process command line */
 
@@ -5601 +5613 @@
     }
 
+#ifdef VBOX_GUI_WITH_SYSTRAY
+    if (mIncreasedWindowCounter)
+    {
+        /* Decrease open Fe/Qt4 windows reference count. */
+        int c = mVBox.GetExtraData (VBoxDefs::GUI_MainWindowCount).toInt() - 1;
+        AssertMsg ((c >= 0) || (mVBox.isOk()),
+            ("Something went wrong with the window reference count!"));
+        if (c < 0)
+            c = 0;   /* Clean up the mess. */
+        mVBox.SetExtraData (VBoxDefs::GUI_MainWindowCount,
+                            (c > 0) ? QString ("%1").arg (c) : NULL);
+        AssertWrapperOk (mVBox);
+        if (c == 0)
+        {
+            mVBox.SetExtraData (VBoxDefs::GUI_TrayIconWinID, NULL);
+            AssertWrapperOk (mVBox);
+        }
+    }
+#endif
+
     if (!callback.isNull())
     {
@@ -5625 +5657 @@
     if (mSelectorWnd)
         delete mSelectorWnd;
-
-#ifdef VBOX_GUI_WITH_SYSTRAY
-    /* Decrease open Fe/Qt4 windows reference count. */
-    int c = mVBox.GetExtraData (VBoxDefs::GUI_MainWindowCount).toInt() - 1;
-    AssertMsg ((c>=0) || (mVBox.isOk()),
-        ("Something went wrong with the window reference count!"));
-    if (c < 0)
-        c = 0;   /* Clean up the mess. */
-    mVBox.SetExtraData (VBoxDefs::GUI_MainWindowCount, (c > 0) ? QString ("%1").arg (c) : NULL);
-    if (c == 0)
-        mVBox.SetExtraData (VBoxDefs::GUI_TrayIconWinID, NULL);
-#endif
 
     /* ensure CGuestOSType objects are no longer used */

trunk/src/VBox/Frontends/VirtualBox4/src/main.cpp

@@ -346 +346 @@
                 break;
 
-            /* Note: the settings conversion check must be done before
-             * anything else that can unconditionally overwrite settings files
-             * int he new format (like the license thingy below) */
-            if (!vboxGlobal().checkForAutoConvertedSettings())
-                break;
-
 #ifndef VBOX_OSE
 #ifdef Q_WS_X11