Moved to Win32 monitor device string for public name.

ago%!(EXTRA string=12 years) · b872089fa9
parent cbb6d1ad7b
commit b872089fa9
1 changed files with 7 additions and 7 deletions
--- 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),