Changeset 61603 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray

Timestamp:

Jun 9, 2016 7:48:13 AM (9 years ago)

Author:

vboxsync

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

107945

Message:

VBoxTray: fixed regression from r107867: do not re-enable disabled screens

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDispIf.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDispIf.cpp

@@ -1458 +1458 @@
         winEr = NO_ERROR;
 
-        if (i == iChangedMode && fEnable)
+        /* Whether the current display should be enabled. */
+        BOOL fCurrentEnable = i == iChangedMode?
+                                 fEnable:
+                                 RT_BOOL(paDisplayDevices[i].StateFlags & DISPLAY_DEVICE_ACTIVE);
+
+        if (i == iChangedMode && fCurrentEnable)
         {
             RTRECTSIZE Size;
@@ -1473 +1478 @@
         if (winEr == NO_ERROR)
         {
-            winEr = vboxDispIfResizePerform(pIf, i, fEnable, fExtDispSup, paDisplayDevices, paDeviceModes, cDevModes);
+            winEr = vboxDispIfResizePerform(pIf, i, fCurrentEnable, fExtDispSup, paDisplayDevices, paDeviceModes, cDevModes);
 
             LogFunc(("vboxDispIfResizePerform returned %d\n", winEr));
@@ -1479 +1484 @@
             if (winEr == ERROR_RETRY)
             {
-                VBoxRrRetrySchedule(pIf, i, fEnable, fExtDispSup, paDisplayDevices, paDeviceModes, cDevModes);
+                VBoxRrRetrySchedule(pIf, i, fCurrentEnable, fExtDispSup, paDisplayDevices, paDeviceModes, cDevModes);
 
                 winEr = NO_ERROR;