From b0350cceece74ac343b6a441579db22ff1d8b6fe Mon Sep 17 00:00:00 2001
From: Piotr Kosek <piotr@kosek.com>
Date: Fri, 31 May 2024 05:06:33 +0200
Subject: [PATCH] Fixed cancel_quit on windows not doing anything

---
 src/native/windows.rs | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/native/windows.rs b/src/native/windows.rs
index 68399b6a..82cbb953 100644
--- a/src/native/windows.rs
+++ b/src/native/windows.rs
@@ -284,15 +284,17 @@ unsafe extern "system" fn win32_wndproc(
 
     match umsg {
         WM_CLOSE => {
-            let mut quit_requested = false;
-
             let mut d = crate::native_display().lock().unwrap();
             // only give user a chance to intervene when sapp_quit() wasn't already called
             if !d.quit_ordered {
                 // if window should be closed and event handling is enabled, give user code
                 // a change to intervene via sapp_cancel_quit()
                 d.quit_requested = true;
-                quit_requested = true;
+                drop(d);
+                // the prevent event may require access to native_display
+                event_handler.quit_requested_event();
+                // Re-acquire native_display
+                d = crate::native_display().lock().unwrap();
                 // if user code hasn't intervened, quit the app
                 if d.quit_requested {
                     d.quit_ordered = true;
@@ -301,11 +303,6 @@ unsafe extern "system" fn win32_wndproc(
             if d.quit_ordered {
                 PostQuitMessage(0);
             }
-
-            if quit_requested {
-                drop(d);
-                event_handler.quit_requested_event();
-            }
             return 0;
         }
         WM_SYSCOMMAND => {