Changeset 55804 in vbox for trunk/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp

Timestamp:

May 11, 2015 2:59:17 PM (10 years ago)

Author:

vboxsync

Message:

Additions/common/VBoxControl: fix a conditional test.

File:

• trunk/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp

@@ -988 +988 @@
         /* check if the mode is OK */
         if (   (xres > (1 << 16))
-            && (yres > (1 << 16))
-            && (   (bpp != 16)
-                || (bpp != 24)
-                || (bpp != 32)))
+            || (yres > (1 << 16))
+            || (   (bpp != 16)
+                && (bpp != 24)
+                && (bpp != 32)))
             break;
 
@@ -1099 +1099 @@
     /** @todo better check including xres mod 8 = 0! */
     if (   (xres > (1 << 16))
-        && (yres > (1 << 16))
-        && (   (bpp != 16)
-            || (bpp != 24)
-            || (bpp != 32)))
+        || (yres > (1 << 16))
+        || (   (bpp != 16)
+            && (bpp != 24)
+            && (bpp != 32)))
     {
         VBoxControlError("invalid mode specified!\n");