From d3c6abac4ee788832fad4bfeadadc12a417faf1e Mon Sep 17 00:00:00 2001
From: Stephen Miller <56742918+StevenMiller123@users.noreply.github.com>
Date: Mon, 2 Feb 2026 00:16:59 -0600
Subject: [PATCH] Fix default pthread attributes (#3987)

This matches libkernel decomp + old fpPS4 code.
Fixes Attack On Titan 2 audio
---
 src/core/libraries/kernel/threads/pthread.cpp      | 8 +-------
 src/core/libraries/kernel/threads/pthread.h        | 6 ++++++
 src/core/libraries/kernel/threads/pthread_attr.cpp | 6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/core/libraries/kernel/threads/pthread.cpp b/src/core/libraries/kernel/threads/pthread.cpp
index f1107ef30..20bd20f4b 100644
--- a/src/core/libraries/kernel/threads/pthread.cpp
+++ b/src/core/libraries/kernel/threads/pthread.cpp
@@ -14,12 +14,6 @@
 
 namespace Libraries::Kernel {
 
-constexpr int PthreadInheritSched = 4;
-
-constexpr int ORBIS_KERNEL_PRIO_FIFO_DEFAULT = 700;
-constexpr int ORBIS_KERNEL_PRIO_FIFO_HIGHEST = 256;
-constexpr int ORBIS_KERNEL_PRIO_FIFO_LOWEST = 767;
-
 extern PthreadAttr PthreadAttrDefault;
 
 void _thread_cleanupspecific();
@@ -231,7 +225,7 @@ int PS4_SYSV_ABI posix_pthread_create_name_np(PthreadT* thread, const PthreadAtt
         new_thread->attr = *(*attr);
         new_thread->attr.cpusetsize = 0;
     }
-    if (new_thread->attr.sched_inherit == PthreadInheritSched) {
+    if (curthread != nullptr && new_thread->attr.sched_inherit == PthreadInheritSched) {
         if (True(curthread->attr.flags & PthreadAttrFlags::ScopeSystem)) {
             new_thread->attr.flags |= PthreadAttrFlags::ScopeSystem;
         } else {
diff --git a/src/core/libraries/kernel/threads/pthread.h b/src/core/libraries/kernel/threads/pthread.h
index cc1cb3829..fed3b96fe 100644
--- a/src/core/libraries/kernel/threads/pthread.h
+++ b/src/core/libraries/kernel/threads/pthread.h
@@ -24,6 +24,12 @@ class SymbolsResolver;
 
 namespace Libraries::Kernel {
 
+constexpr int PthreadInheritSched = 4;
+
+constexpr int ORBIS_KERNEL_PRIO_FIFO_DEFAULT = 700;
+constexpr int ORBIS_KERNEL_PRIO_FIFO_HIGHEST = 256;
+constexpr int ORBIS_KERNEL_PRIO_FIFO_LOWEST = 767;
+
 struct Pthread;
 
 enum class PthreadMutexFlags : u32 {
diff --git a/src/core/libraries/kernel/threads/pthread_attr.cpp b/src/core/libraries/kernel/threads/pthread_attr.cpp
index 4fe9e72f2..aa5781f4f 100644
--- a/src/core/libraries/kernel/threads/pthread_attr.cpp
+++ b/src/core/libraries/kernel/threads/pthread_attr.cpp
@@ -24,9 +24,9 @@ static constexpr std::array<PthreadPrio, 3> ThrPriorities = {{
 }};
 
 PthreadAttr PthreadAttrDefault = {
-    .sched_policy = SchedPolicy::Fifo,
-    .sched_inherit = 0,
-    .prio = 0,
+    .sched_policy = SchedPolicy::Other,
+    .sched_inherit = PthreadInheritSched,
+    .prio = ORBIS_KERNEL_PRIO_FIFO_DEFAULT,
     .suspend = false,
     .flags = PthreadAttrFlags::ScopeSystem,
     .stackaddr_attr = nullptr,