GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-09 15:17:24 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

Fix #2377: add null check for mAudioOutput in processAudioSegments to prevent NPE when no audio outputs present (#2378)

Browse Source 
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Uğur Tafralı
2026-07-11 11:06:18 +03:00
committed by GitHub
parent 7cf6974b6b
commit 788d994ad7
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/io/github/dsheirer/audio/playback/AudioPlaybackManager.java
View File

@@ -189,28 +189,31 @@ public class AudioPlaybackManager implements Listener<AudioSegment>, IAudioContr
}
else if(audioSegment.isLinked())
{
mAudioChannelsLock.lock();
try
if(mAudioOutput != null)
{
for(AudioChannel audioOutput: mAudioOutput.getAudioProvider().getAudioChannels())
mAudioChannelsLock.lock();
try
{
if(audioOutput.isLinkedTo(audioSegment))
for(AudioChannel audioOutput: mAudioOutput.getAudioProvider().getAudioChannels())
{
it.remove();
audioOutput.play(audioSegment);
if(audioOutput.isLinkedTo(audioSegment))
{
it.remove();
audioOutput.play(audioSegment);
}
}
}
}
finally
{
mAudioChannelsLock.unlock();
finally
{
mAudioChannelsLock.unlock();
}
}
}
}
//Sort audio segments by playback priority and assign to empty audio outputs
if(!mAudioSegments.isEmpty())
if(!mAudioSegments.isEmpty() && mAudioOutput != null)
{
mAudioSegments.sort(mAudioSegmentPrioritySorter);
mAudioChannelsLock.lock();