From aae82430f21c810b5817d0aa25c1860357de0819 Mon Sep 17 00:00:00 2001
From: Parker Lamb <parkerlamb@users.noreply.github.com>
Date: Sat, 1 Jul 2017 15:27:06 -0500
Subject: [PATCH] Emulator: Don't trigger on_launch() until the main thread is
 set.

---
 src/xenia/emulator.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/xenia/emulator.cc b/src/xenia/emulator.cc
index d90530cdb..a7d6d9281 100644
--- a/src/xenia/emulator.cc
+++ b/src/xenia/emulator.cc
@@ -641,8 +641,8 @@ X_STATUS Emulator::CompleteLaunch(const std::wstring& path,
     return X_STATUS_UNSUCCESSFUL;
   }
 
-  on_launch();
   main_thread_ = main_xthread->thread();
+  on_launch();
 
   return X_STATUS_SUCCESS;
 }