Fixed memory management issue while closing native Win32 window (#1126)

neutralinojs · Jul 14, 2023 · 6029bcd · Spishous · Apr 5, 2024 · 6029bcd
1 parent dc417e9
commit 6029bcd
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/lib/webview/webview.h b/lib/webview/webview.h
@@ -1336,10 +1336,25 @@ class win32_edge_engine {
   }
   void *window() { return (void *)m_window; }
   void terminate(int exitCode = 0) {
+
+    // event to wait for window close completion
+    auto evtWindowClosed = CreateEvent(
+        NULL,               // default security attributes
+        TRUE,               // manual-reset event
+        FALSE,              // initial state is nonsignaled
+        TEXT("WindowClosedEvent")  // object name
+    );
     processExitCode = exitCode;
+
     dispatch([=]() {
         DestroyWindow(m_window);
+        SetEvent(evtWindowClosed);
     });
+
+    // wait for dispatch() to complete
+    WaitForSingleObject(evtWindowClosed, 10000);
+    CloseHandle(evtWindowClosed);
+
   }
   void dispatch(dispatch_fn_t f) {
     PostThreadMessage(m_main_thread, WM_APP, 0, (LPARAM) new dispatch_fn_t(f));