From 52a55695ce8a8fab8f8ab5193abbb27c97cb601c Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 14 Jul 2018 00:10:21 +0200
Subject: [PATCH] Re-revert this - causes issues with toggling fullscreen with
 threaded video mode and GL driver

---
 gfx/common/win32_common.c | 6 +-----
 retroarch.c               | 7 +++++++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/gfx/common/win32_common.c b/gfx/common/win32_common.c
index 495e51c316..bc38d81da8 100644
--- a/gfx/common/win32_common.c
+++ b/gfx/common/win32_common.c
@@ -1045,12 +1045,7 @@ void win32_check_window(bool *quit, bool *resize,
       unsigned *width, unsigned *height)
 {
 #if !defined(_XBOX)
-   const ui_application_t *application =
-      ui_companion_driver_get_application_ptr();
-   if (application)
-      application->process_events();
    *quit            = g_win32_quit;
-#endif
 
    if (g_win32_resized)
    {
@@ -1059,6 +1054,7 @@ void win32_check_window(bool *quit, bool *resize,
       *height             = g_win32_resize_height;
       g_win32_resized     = false;
    }
+#endif
 }
 
 bool win32_suppress_screensaver(void *data, bool enable)
diff --git a/retroarch.c b/retroarch.c
index 84451a1d9e..a4a02fb3e0 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -2535,6 +2535,13 @@ static enum runloop_state runloop_check_state(
       }
    }
 
+   {
+      const ui_application_t *application =
+         ui_companion_driver_get_application_ptr();
+      if (application)
+         application->process_events();
+   }
+
    video_driver_get_status(&frame_count, &is_alive, &is_focused);
 
 #ifdef HAVE_MENU