From b872089fa945d053c64cd9b1a237e9b59e01473c Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Fri, 1 Feb 2013 00:52:25 +0100 Subject: [PATCH] Moved to Win32 monitor device string for public name. --- src/win32_monitor.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/win32_monitor.c b/src/win32_monitor.c index 84ff1284..3283db7a 100644 --- a/src/win32_monitor.c +++ b/src/win32_monitor.c @@ -140,13 +140,6 @@ _GLFWmonitor** _glfwPlatformGetMonitors(int* count) &settings, EDS_ROTATEDMODE); - name = _glfwCreateUTF8FromWideString(adapter.DeviceName); - if (!name) - { - // TODO: wat - return NULL; - } - if (found == size) { if (size) @@ -170,6 +163,13 @@ _GLFWmonitor** _glfwPlatformGetMonitors(int* count) primary = adapter.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE; + name = _glfwCreateUTF8FromWideString(monitor.DeviceString); + if (!name) + { + // TODO: wat + return NULL; + } + monitors[found] = _glfwCreateMonitor(name, primary, GetDeviceCaps(dc, HORZSIZE), GetDeviceCaps(dc, VERTSIZE),