Fix crash when stopping player.

thetwom · Aug 11, 2020 · 2ed57b3 · 2ed57b3
1 parent 4c93c7f
commit 2ed57b3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
  applicationId "de.moekadu.metronome"
  minSdkVersion 23
  targetSdkVersion 29
- versionCode 22
- versionName "1.6.7"
+ versionCode 23
+ versionName "1.6.8"
  resValue "string", "version", "${versionName}"
  testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
  }

diff --git a/app/src/main/java/de/moekadu/metronome/AudioMixer.kt b/app/src/main/java/de/moekadu/metronome/AudioMixer.kt
@@ -238,11 +238,11 @@ class AudioMixer (val context: Context) {
 
  /// Stop playing
  fun stop() {
- if(player != null) {
- player?.pause()
- player?.flush()
- player?.release()
+ player?.let {audioTrack ->
  player = null
+ audioTrack.pause()
+ audioTrack.flush()
+ audioTrack.release()
  }
  isPlaying = false
  }
@@ -353,7 +353,7 @@ class AudioMixer (val context: Context) {
  }
  val numWrite = player?.write(mixingBuffer, 0, mixingBuffer.size, AudioTrack.WRITE_NON_BLOCKING)
 // Log.v("AudioMixer", "AudioMixer:mixAndQueueTracks : wrote $numWrite to audioTrack")
- if(numWrite != mixingBuffer.size)
+ if(numWrite != mixingBuffer.size && numWrite != null)
  throw RuntimeException("Nonblocking write of ${mixingBuffer.size} samples to AudioTrack not possible")
  }
 }

diff --git a/fastlane/metadata/android/en-US/changelogs/23.txt b/fastlane/metadata/android/en-US/changelogs/23.txt
@@ -0,0 +1 @@
+Fix crash when stopping the player