mirror of
https://github.com/holub/mame
synced 2025-07-06 02:18:09 +03:00
fixed MT#4846: make sure, that we always get a win_monitor_info* in winwindow_video_window_monitor() [Oliver Stöneberg]
This commit is contained in:
parent
368caac5a2
commit
f48344c62e
@ -834,15 +834,19 @@ void winwindow_video_window_update(win_window_info *window)
|
||||
|
||||
win_monitor_info *winwindow_video_window_monitor(win_window_info *window, const RECT *proposed)
|
||||
{
|
||||
win_monitor_info *monitor;
|
||||
win_monitor_info *monitor = NULL;
|
||||
|
||||
// in window mode, find the nearest
|
||||
if (!window->fullscreen)
|
||||
{
|
||||
if (proposed != NULL)
|
||||
monitor = winvideo_monitor_from_handle(MonitorFromRect(proposed, MONITOR_DEFAULTTONEAREST));
|
||||
else
|
||||
monitor = winvideo_monitor_from_handle(MonitorFromWindow(window->hwnd, MONITOR_DEFAULTTONEAREST));
|
||||
// result can be NULL when e.g. the color scheme changes
|
||||
do
|
||||
{
|
||||
if (proposed != NULL)
|
||||
monitor = winvideo_monitor_from_handle(MonitorFromRect(proposed, MONITOR_DEFAULTTONEAREST));
|
||||
else
|
||||
monitor = winvideo_monitor_from_handle(MonitorFromWindow(window->hwnd, MONITOR_DEFAULTTONEAREST));
|
||||
} while (monitor == NULL);
|
||||
}
|
||||
|
||||
// in full screen, just use the configured monitor
|
||||
|
Loading…
Reference in New Issue
Block a user