Changeset 54792 in vbox for trunk/src/VBox

Timestamp:

Mar 16, 2015 4:04:24 PM (10 years ago)

Author:

vboxsync

Message:

DisplayUtils: use >= when check sSSMDisplayVerX in readSavedGuestScreenInfo() (addition to r98984).

File:

• trunk/src/VBox/Main/src-all/DisplayUtils.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-all/DisplayUtils.cpp

@@ -164 +164 @@
         if (RT_SUCCESS(vrc))
         {
-            if (   uVersion == sSSMDisplayVer2
-                || uVersion == sSSMDisplayVer3
-                || uVersion == sSSMDisplayVer4
-                || uVersion == sSSMDisplayVer5)
+            /* Starting from sSSMDisplayVer2 we have pu32Width and pu32Height.
+             * Starting from sSSMDisplayVer3 we have all the rest of parameters we need. */
+            if (uVersion >= sSSMDisplayVer2)
             {
                 uint32_t cMonitors;
@@ -189 +188 @@
                     else
                     {
-                        Assert(uVersion == sSSMDisplayVer3);
                         /* Skip all previous monitors, each 8 uint32_t, and the first 3 uint32_t entries. */
                         SSMR3Skip(pSSM, u32ScreenId * 8 * sizeof(uint32_t) + 3 * sizeof(uint32_t));