From c004d669c24a36f9ffbf1ff52f252475120ed68a Mon Sep 17 00:00:00 2001
From: NicknineTheEagle <nik18.1995@gmail.com>
Date: Sun, 16 Jun 2024 10:16:10 +0300
Subject: [PATCH] [Emulator] Removed legacy title re-launching code

---
 src/xenia/app/xenia_main.cc |  9 +--------
 src/xenia/emulator.cc       | 14 --------------
 src/xenia/emulator.h        |  2 --
 3 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/src/xenia/app/xenia_main.cc b/src/xenia/app/xenia_main.cc
index a223bac7c..15c6edd62 100644
--- a/src/xenia/app/xenia_main.cc
+++ b/src/xenia/app/xenia_main.cc
@@ -642,14 +642,7 @@ void EmulatorApp::EmulatorThread() {
   // Now, we're going to use this thread to drive events related to emulation.
   while (!emulator_thread_quit_requested_.load(std::memory_order_relaxed)) {
     xe::threading::Wait(emulator_thread_event_.get(), false);
-    while (true) {
-      emulator_->WaitUntilExit();
-      if (emulator_->TitleRequested()) {
-        emulator_->LaunchNextTitle();
-      } else {
-        break;
-      }
-    }
+    emulator_->WaitUntilExit();
   }
 }
 
diff --git a/src/xenia/emulator.cc b/src/xenia/emulator.cc
index c323273c5..bc6a55458 100644
--- a/src/xenia/emulator.cc
+++ b/src/xenia/emulator.cc
@@ -905,20 +905,6 @@ bool Emulator::RestoreFromFile(const std::filesystem::path& path) {
   return true;
 }
 
-bool Emulator::TitleRequested() {
-  auto xam = kernel_state()->GetKernelModule<kernel::xam::XamModule>("xam.xex");
-  return xam->loader_data().launch_data_present;
-}
-
-void Emulator::LaunchNextTitle() {
-  auto xam = kernel_state()->GetKernelModule<kernel::xam::XamModule>("xam.xex");
-  auto next_title = xam->loader_data().launch_path;
-
-  // Swap disk doesn't require reloading
-  // This function should be purged?
-  CompleteLaunch("", next_title);
-}
-
 const std::filesystem::path Emulator::GetNewDiscPath(
     std::string window_message) {
   std::filesystem::path path = "";
diff --git a/src/xenia/emulator.h b/src/xenia/emulator.h
index 5ef971edc..f9f1835c6 100644
--- a/src/xenia/emulator.h
+++ b/src/xenia/emulator.h
@@ -248,8 +248,6 @@ class Emulator {
   bool RestoreFromFile(const std::filesystem::path& path);
 
   // The game can request another title to be loaded.
-  bool TitleRequested();
-  void LaunchNextTitle();
   const std::filesystem::path GetNewDiscPath(std::string window_message = "");
 
   void WaitUntilExit();