fix: bind on_ready to the application not the window (#20)

Signed-off-by: Tony Gorez <[email protected]>
sourcemeta-research · Oct 29, 2024 · 9993642 · 9993642
1 parent 7789fee
commit 9993642
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/application/win32/app_win32.cc b/src/application/win32/app_win32.cc
@@ -35,7 +35,14 @@ auto Application::run() noexcept -> int {
   assert(!running_);
   running_ = true;
 
-  on_start();
+  try {
+    this->on_start();
+    // It seems that win32 doesn't have a ready message
+    // which is app-wide, events are correlated to the window
+    this->on_ready();
+  } catch (...) {
+    this->on_error(std::current_exception());
+  }
 
   const char CLASS_NAME[] = "NativeWin32ApplicationClass";
 

diff --git a/src/application/win32/delegate_win32.cc b/src/application/win32/delegate_win32.cc
@@ -10,11 +10,6 @@ LRESULT CALLBACK AppDelegate::WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam,
                                          LPARAM lParam) {
   switch (uMsg) {
   case WM_CREATE:
-    // try {
-    ApplicationInternals::on_ready();
-    // } catch (...) {
-    //   ApplicationInternals::on_error(std::current_exception());
-    // }
     return 0;
   case WM_DESTROY:
     PostQuitMessage(0);