This commit is contained in:
Henrik Rydgård
2025-08-24 15:46:35 +02:00
parent 7315e7a2a9
commit 93638c8826
3 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -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);
}
-2
View File
@@ -144,8 +144,6 @@ void Core_ListenLifecycle(CoreLifecycleFunc func) {
}
void Core_NotifyLifecycle(CoreLifecycle stage) {
AssertCurrentThreadName("EmuThread");
if (stage == CoreLifecycle::STARTING) {
Core_ResetException();
}
+2
View File
@@ -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 {