Fix for a potential crash

SirMangler · Mar 24, 2023 · 7003c24 · 7003c24
1 parent a1cf68c
commit 7003c24
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 16 deletions.
diff --git a/Source/Core/DolphinUWP/App.cpp b/Source/Core/DolphinUWP/App.cpp
@@ -229,8 +229,6 @@ struct App : implements<App, IFrameworkViewSource, IFrameworkView>
     std::unique_ptr<BootParameters> boot =
         BootParameters::GenerateFromFile(path, BootSessionData("", DeleteSavestateAfterBoot::No));
 
-    UICommon::InitControllers(wsi);
-
     if (!BootManager::BootCore(std::move(boot), wsi))
     {
       fprintf(stderr, "Could not boot the specified file\n");
@@ -290,6 +288,7 @@ struct App : implements<App, IFrameworkViewSource, IFrameworkView>
     UICommon::SetUserDirectory(UWP::GetUserLocation());
     UICommon::CreateDirectories();
     UICommon::Init();
+    UICommon::InitControllers({});
 
     std::string gamePath = filePath.str();
     if (!gamePath.empty() && gamePath != "")

diff --git a/Source/Core/DolphinUWP/ImGuiFrontend.cpp b/Source/Core/DolphinUWP/ImGuiFrontend.cpp
@@ -147,16 +147,13 @@ ImGuiFrontend::ImGuiFrontend()
   WindowSystemInfo prepared_wsi(wsi);
   g_video_backend->PrepareWindow(prepared_wsi);
 
-
   VideoBackendBase::PopulateBackendInfo();
   if (!g_video_backend->Initialize(wsi))
   {
     PanicAlertFmt("Failed to initialize video backend!");
     return;
   }
 
-  g_controller_interface.Initialize({});
-
   ImGui::GetIO().KeyMap[ImGuiKey_Backspace] = '\b';
 
   PopulateControls();
@@ -485,7 +482,6 @@ FrontendResult ImGuiFrontend::RunMainLoop()
   }
 
   g_renderer->EndUIFrame();
-  g_controller_interface.Shutdown();
 
   return selection;
 }

diff --git a/Source/Core/DolphinUWP/ImGuiFrontend.h b/Source/Core/DolphinUWP/ImGuiFrontend.h
@@ -38,6 +38,7 @@ class ImGuiFrontend
   ImGuiFrontend();
   FrontendResult RunUntilSelection();
   Core::TitleDatabase m_title_database;
+  std::mutex m_frontend_mutex;
 
 private:
   void PopulateControls();

diff --git a/Source/Core/DolphinUWP/ImGuiNetplay.cpp b/Source/Core/DolphinUWP/ImGuiNetplay.cpp
@@ -2,6 +2,8 @@
 #include "UWPUtils.h"
 #include "WinRTKeyboard.h"
 
+#include "imgui.h"
+
 #include <algorithm>
 #include <cctype>
 
@@ -26,9 +28,8 @@
 #include "UICommon/GameFile.h"
 #include "UICommon/UICommon.h"
 
-#include "imgui.h"
-#include <VideoCommon/NetPlayChatUI.h>
-#include <VideoCommon/OnScreenDisplay.h>
+#include "VideoCommon/NetPlayChatUI.h"
+#include "VideoCommon/OnScreenDisplay.h"
 
 using winrt::Windows::UI::Core::CoreWindow;
 using namespace winrt;
@@ -459,9 +460,6 @@ void ImGuiNetPlay::BootGame(const std::string& filename,
   CoreApplication::MainView().Dispatcher().RunAsync(
       winrt::Windows::UI::Core::CoreDispatcherPriority::Normal,
       [filename, data = std::move(boot_session_data)] {
-        // Todo, proper synchronisation
-        Sleep(100); // avoid a race condition where we initialise before the frontend closes
-
         CoreWindow window = CoreWindow::GetForCurrentThread();
         void* abi = winrt::get_abi(window);
 
@@ -490,8 +488,6 @@ void ImGuiNetPlay::BootGame(const std::string& filename,
         std::unique_ptr<BootParameters> boot =
             BootParameters::GenerateFromFile(filename, std::move(*data));
 
-        UICommon::InitControllers(wsi);
-
         if (!BootManager::BootCore(std::move(boot), wsi))
         {
           fprintf(stderr, "Could not boot the specified file\n");
@@ -626,8 +622,6 @@ void ImGuiNetPlay::OnTraversalStateChanged(TraversalClient::State state)
 
 void ImGuiNetPlay::OnGameStartAborted()
 {
-  g_netplay_client->StopGame();
-
   if (Core::IsRunningAndStarted())
   {
     UWP::g_shutdown_requested.Set();