Browse Source

windows: If a display's friendly name is blank, try the generic name.

Fixes #6031.
Ryan C. Gordon 2 years ago
parent
commit
c6c0a8394e
1 changed files with 6 additions and 0 deletions
  1. 6 0
      src/video/windows/SDL_windowsmodes.c

+ 6 - 0
src/video/windows/SDL_windowsmodes.c

@@ -271,6 +271,12 @@ WIN_GetDisplayNameVista(const WCHAR *deviceName)
             rc = pDisplayConfigGetDeviceInfo(&targetName.header);
             if (rc == ERROR_SUCCESS) {
                 retval = WIN_StringToUTF8W(targetName.monitorFriendlyDeviceName);
+                /* if we got an empty string, treat it as failure so we'll fallback
+                   to getting the generic name. */
+                if (retval && (*retval == '\0')) {
+                    SDL_free(retval);
+                    retval = NULL;
+                }
             }
             break;
         }