summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorJörg Mensmann <joerg_ml@bitplanet.de>2012-04-17 10:48:19 +0100
committerJon TURNEY <jon.turney@dronecode.org.uk>2012-07-16 13:59:29 +0100
commit5940580f8c12145c1ef4c3eee898676b48d95879 (patch)
tree0c2dec539b445d9037460fddc727c3d0a35d6755 /hw
parent18801f5e5a98d80f4811ade8c98df65175b1935a (diff)
hw/xwin: Fix command line arguments for multiple monitors.
Moving Xwin to a certain monitor using "-screen 0 @2" would fail, printing "ddxProcessArgument - screen - Querying monitors failed". This happened since commit 3ead1d810b0e157078db39712e02ea6dc85216d8, because EnumDisplayMonitor() returns FALSE if its callback function returns FALSE (which is not clearly documented), and QueryMonitor() would then also return FALSE. Moving back to the old behaviour, where the return value of EnumDisplayMonitors() is ignored. Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Diffstat (limited to 'hw')
-rw-r--r--hw/xwin/winmonitors.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/xwin/winmonitors.c b/hw/xwin/winmonitors.c
index 473241099..07532f6f5 100644
--- a/hw/xwin/winmonitors.c
+++ b/hw/xwin/winmonitors.c
@@ -64,5 +64,7 @@ QueryMonitor(int index, struct GetMonitorInfoData *data)
data->requestedMonitor = index;
/* query information */
- return EnumDisplayMonitors(NULL, NULL, getMonitorInfo, (LPARAM) data);
+ EnumDisplayMonitors(NULL, NULL, getMonitorInfo, (LPARAM) data);
+
+ return TRUE;
}