Changeset 56022 in vbox for trunk/src

Timestamp:

May 22, 2015 9:28:22 AM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: Selector UI: Details-pane: VM preview: Do not assert if guest-screen size is null, deal with it instead.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGMachinePreview.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGMachinePreview.cpp

@@ -213 +213 @@
                         break;
 
-                    /* Calculate aspect-ratio: */
-                    double dAspectRatio = (double)uGuestWidth / uGuestHeight;
-                    /* Look for the best aspect-ratio preset: */
-                    preset = bestAspectRatioPreset(dAspectRatio, m_ratios);
+                    if (uGuestWidth > 0 && uGuestHeight > 0)
+                    {
+                        /* Calculate aspect-ratio: */
+                        const double dAspectRatio = (double)uGuestWidth / uGuestHeight;
+                        /* Look for the best aspect-ratio preset: */
+                        preset = bestAspectRatioPreset(dAspectRatio, m_ratios);
+                    }
 
                     /* Create image based on shallow copy or screenshot data,
@@ -246 +249 @@
                         break;
 
-                    /* Calculate aspect-ratio: */
-                    LONG iOriginX, iOriginY;
-                    ULONG uGuestWidth, uGuestHeight, uBpp;
+                    /* Acquire guest-screen attributes: */
+                    LONG iOriginX = 0, iOriginY = 0;
+                    ULONG uGuestWidth = 0, uGuestHeight = 0, uBpp = 0;
                     KGuestMonitorStatus monitorStatus = KGuestMonitorStatus_Enabled;
                     display.GetScreenResolution(0, uGuestWidth, uGuestHeight, uBpp, iOriginX, iOriginY, monitorStatus);
-                    if (uGuestWidth == 0 || uGuestHeight == 0)
+                    if (uGuestWidth > 0 && uGuestHeight > 0)
                     {
-                        AssertMsgFailed(("Acquired guest screen resolution is %dx%d\n",
-                                         uGuestWidth, uGuestHeight));
-                        break;
+                        /* Calculate aspect-ratio: */
+                        const double dAspectRatio = (double)uGuestWidth / uGuestHeight;
+                        /* Look for the best aspect-ratio preset: */
+                        preset = bestAspectRatioPreset(dAspectRatio, m_ratios);
                     }
-
-                    double dAspectRatio = (double)uGuestWidth / uGuestHeight;
-                    /* Look for the best aspect-ratio preset preset: */
-                    preset = bestAspectRatioPreset(dAspectRatio, m_ratios);
 
                     /* Calculate size corresponding to aspect-ratio: */
@@ -524 +524 @@
     /* Make sure host-size and guest-size are valid: */
     AssertReturn(!hostSize.isNull(), QSize());
-    AssertReturn(!guestSize.isNull(), hostSize);
+    if (guestSize.isNull())
+        return hostSize;
 
     /* Calculate host/guest aspect-ratio: */