From 50fc5dfde5a8da6b93532ea233cf1a49b850da89 Mon Sep 17 00:00:00 2001
From: Nekotekina <nekotekina@gmail.com>
Date: Thu, 26 Sep 2019 19:07:17 +0300
Subject: [PATCH] Use g_fxo for rsx::rsx_replay_thread

---
 Utilities/Thread.h   | 1 +
 rpcs3/Emu/System.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Utilities/Thread.h b/Utilities/Thread.h
index d9ad7f28e8..714acc0473 100644
--- a/Utilities/Thread.h
+++ b/Utilities/Thread.h
@@ -411,6 +411,7 @@ class named_thread final : public Context, result_storage_t<Context>, thread_bas
 
 public:
 	// Default constructor
+	template <bool Valid = std::is_default_constructible_v<Context>, typename = std::enable_if_t<Valid>>
 	named_thread()
 		: Context()
 		, thread(get_default_thread_name())
diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp
index 0e39c971e6..9fcafa3379 100644
--- a/rpcs3/Emu/System.cpp
+++ b/rpcs3/Emu/System.cpp
@@ -655,7 +655,7 @@ bool Emulator::BootRsxCapture(const std::string& path)
 	GetCallbacks().on_run();
 	m_state = system_state::running;
 
-	fxm::make<named_thread<rsx::rsx_replay_thread>>("RSX Replay", std::move(frame));
+	g_fxo->init<named_thread<rsx::rsx_replay_thread>>("RSX Replay"sv, std::move(frame));
 
 	return true;
 }