Bind Win32 app shell and move more legacy platform state

2026-06-17 01:54:59 +02:00
parent 3cbc88fe78
commit 5c8a87faa0
11 changed files with 185 additions and 123 deletions
--- a/src/platform_windows/windows_lifecycle_shell.cpp
+++ b/src/platform_windows/windows_lifecycle_shell.cpp
@@ -46,13 +46,17 @@ void request_window_close(HWND hWnd)

 void handle_window_close_message(VrShellState& vr)
 {
+    auto* app = bound_app();
+    auto* runtime = bound_runtime();
    mark_lifecycle_stopped();
    request_stop_and_join_vr_thread(vr);
-    App::I->runtime().ui_thread_stop();
-    App::I->runtime().render_thread_stop();
-    App::I->terminate();
+    runtime->ui_thread_stop();
+    runtime->render_thread_stop();
+    app->terminate();
+    App::I = nullptr;
+    bind_app(nullptr);
    bind_runtime(nullptr);
-    delete App::I;
+    delete app;
    PostQuitMessage(0);
 }