diff options
author | Andrew Comminos <andrew@comminos.com> | 2015-09-03 00:38:10 +0300 |
---|---|---|
committer | Andrew Comminos <andrew@comminos.com> | 2015-09-03 00:38:10 +0300 |
commit | 5512a0440cbcac94fdc58823c28c8fef3134be08 (patch) | |
tree | 1d6682fe41eab626dc7c4c8906c1ecdb659f36c3 | |
parent | 7e95ca360e3111307cc6508d370c252cce154c2b (diff) |
Avoid race condition sending audio while shutting down the encoder.
-rw-r--r-- | src/main/java/com/morlunk/jumble/protocol/AudioHandler.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/com/morlunk/jumble/protocol/AudioHandler.java b/src/main/java/com/morlunk/jumble/protocol/AudioHandler.java index c7de222..80d06d9 100644 --- a/src/main/java/com/morlunk/jumble/protocol/AudioHandler.java +++ b/src/main/java/com/morlunk/jumble/protocol/AudioHandler.java @@ -422,9 +422,11 @@ public class AudioHandler extends JumbleNetworkListener implements AudioInput.Au synchronized (mOutput) { mOutput.stopPlaying(); } - if (mEncoder != null) { - mEncoder.destroy(); - mEncoder = null; + synchronized (mEncoderLock) { + if (mEncoder != null) { + mEncoder.destroy(); + mEncoder = null; + } } if(mInitialized) { try { |