Merge pull request xbmc#27436 from thexai/android-fix-crash

thexai · web-flow · commit c7b421860266 · 2025-11-06T16:08:09.000+01:00
[AESinkAUDIOTRACK] Fix crash if audio device is not available
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp
@@ -152,11 +152,13 @@ jni::CJNIAudioTrack *CAESinkAUDIOTRACK::CreateAudioTrack(int stream, int sampleR
     CLog::Log(LOGINFO, "AESinkAUDIOTRACK - AudioTrack creation (channelMask {:#08x}): {}",
               channelMask, e.what());
   }
-  if (jniAt)
+
+  if (jniAt && jniAt->getState() == CJNIAudioTrack::STATE_INITIALIZED)
   {
     jniAt->pause();
     jniAt->flush();
   }
+
   return jniAt;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -152,11 +152,13 @@ jni::CJNIAudioTrack *CAESinkAUDIOTRACK::CreateAudioTrack(int stream, int sampleR`
`152`	`152`	`CLog::Log(LOGINFO, "AESinkAUDIOTRACK - AudioTrack creation (channelMask {:#08x}): {}",`
`153`	`153`	`channelMask, e.what());`
`154`	`154`	`}`
`155`		`- if (jniAt)`
	`155`	`+`
	`156`	`+ if (jniAt && jniAt->getState() == CJNIAudioTrack::STATE_INITIALIZED)`
`156`	`157`	`{`
`157`	`158`	`jniAt->pause();`
`158`	`159`	`jniAt->flush();`
`159`	`160`	`}`
	`161`	`+`
`160`	`162`	`return jniAt;`
`161`	`163`	`}`
`162`	`164`