summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/windows
diff options
context:
space:
mode:
author Oliver Stöneberg <firewave@users.noreply.github.com>2012-12-29 12:44:09 +0000
committer Oliver Stöneberg <firewave@users.noreply.github.com>2012-12-29 12:44:09 +0000
commit46013ad0d96ad6810191ea98756c35b652623466 (patch)
tree9c86c63ae355c2ed97164afecf0d2332c6d4fbef /src/osd/windows
parentf0512fc02172349b601b92f88a18b9ee8d40a5c8 (diff)
reverted bogus fix (nw)
Diffstat (limited to 'src/osd/windows')
-rw-r--r--src/osd/windows/window.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/osd/windows/window.c b/src/osd/windows/window.c
index 2077a428b9f..b4d8114815a 100644
--- a/src/osd/windows/window.c
+++ b/src/osd/windows/window.c
@@ -839,14 +839,10 @@ win_monitor_info *winwindow_video_window_monitor(win_window_info *window, const
// in window mode, find the nearest
if (!window->fullscreen)
{
- // 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);
+ if (proposed != NULL)
+ monitor = winvideo_monitor_from_handle(MonitorFromRect(proposed, MONITOR_DEFAULTTONEAREST));
+ else
+ monitor = winvideo_monitor_from_handle(MonitorFromWindow(window->hwnd, MONITOR_DEFAULTTONEAREST));
}
// in full screen, just use the configured monitor