From 93638c882615e4e18689c155c1dd6dcecd2d7f02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Sun, 24 Aug 2025 15:46:35 +0200
Subject: [PATCH] Test fix

---
 Common/Thread/ThreadUtil.cpp | 2 +-
 Core/Core.cpp                | 2 --
 headless/Headless.cpp        | 2 ++
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Common/Thread/ThreadUtil.cpp b/Common/Thread/ThreadUtil.cpp
index e6e9c7314a..e842a03124 100644
--- a/Common/Thread/ThreadUtil.cpp
+++ b/Common/Thread/ThreadUtil.cpp
@@ -209,7 +209,7 @@ void SetCurrentThreadNameThroughException(const char *threadName) {
 
 void AssertCurrentThreadName(const char *threadName) {
 #ifdef TLS_SUPPORTED
-	if (strcmp(curThreadName, threadName) != 0) {
+	if (curThreadName && strcmp(curThreadName, threadName) != 0) {
 		ERROR_LOG(Log::System, "Thread name assert failed: Expected %s, was %s", threadName, curThreadName);
 		_dbg_assert_msg_(false, "Thread name assert failed: Expected %s, was %s", threadName, curThreadName);
 	}
diff --git a/Core/Core.cpp b/Core/Core.cpp
index e7112c24e6..26a54992e7 100644
--- a/Core/Core.cpp
+++ b/Core/Core.cpp
@@ -144,8 +144,6 @@ void Core_ListenLifecycle(CoreLifecycleFunc func) {
 }
 
 void Core_NotifyLifecycle(CoreLifecycle stage) {
-	AssertCurrentThreadName("EmuThread");
-
 	if (stage == CoreLifecycle::STARTING) {
 		Core_ResetException();
 	}
diff --git a/headless/Headless.cpp b/headless/Headless.cpp
index 352b397c8a..3fa6094274 100644
--- a/headless/Headless.cpp
+++ b/headless/Headless.cpp
@@ -289,6 +289,8 @@ std::vector<std::string> ReadFromListFile(const std::string &listFilename) {
 	char temp[2048]{};
 
 	if (listFilename == "-") {
+		// If you get stuck here in the debugger, you accidentally passed '@-' on the command line, meaning we expect
+		// a list of files on stdin.
 		while (scanf("%2047s", temp) == 1)
 			testFilenames.push_back(temp);
 	} else {