diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java index 2e0a674b2..0c1c1ff0b 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java +++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java @@ -2593,12 +2593,18 @@ public class CallActivity extends CallBaseActivity { private void stopCallingSound() { if (mediaPlayer != null) { - if (mediaPlayer.isPlaying()) { - mediaPlayer.stop(); + try { + if (mediaPlayer.isPlaying()) { + mediaPlayer.stop(); + } + } catch (IllegalStateException e) { + Log.e(TAG, "mediaPlayer was not initialized", e); + } finally { + if (mediaPlayer != null) { + mediaPlayer.release(); + } + mediaPlayer = null; } - - mediaPlayer.release(); - mediaPlayer = null; } }