Changeset 21484 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jul 10, 2009 2:39:02 PM (16 years ago)

Author:

vboxsync

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

49926

Message:

FE/Qt4: do it right

File:

• trunk/src/VBox/Frontends/VirtualBox/src/main.cpp (modified) (2 diffs)

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

@@ -331 +331 @@
          * service will proper work. */
         char *pchOldVar = NULL;
-        if (!RTEnvExist ("VBOX_NO_ARGB_VISUALS_HACK") &&
-            VBoxGlobal::qtRTVersion() >= 0x040500)
+        bool fHackARGB = !RTEnvExist ("VBOX_NO_ARGB_VISUALS_HACK") && VBoxGlobal::qtRTVersion() >= 0x040500;
+        if (fHackARGB)
         {
             const char *pchVar = RTEnvGet ("XLIB_SKIP_ARGB_VISUALS");
@@ -342 +342 @@
         QIApplication a (argc, argv);
         /* Restore previous environment */
-        if (pchOldVar)
-        {
-            RTEnvSet ("XLIB_SKIP_ARGB_VISUALS", pchOldVar);
-            RTStrFree (pchOldVar);
-        }else
-            RTEnvUnset ("XLIB_SKIP_ARGB_VISUALS");
+        if (fHackARGB)
+        {
+            if (pchOldVar)
+            {
+                RTEnvSet ("XLIB_SKIP_ARGB_VISUALS", pchOldVar);
+                RTStrFree (pchOldVar);
+            }
+            else
+                RTEnvUnset ("XLIB_SKIP_ARGB_VISUALS");
+        }
 #else /* defined(Q_WS_X11) && (QT_VERSION >= 0x040500) */
         QIApplication a (argc, argv);