From 6b89fded4f86dfdccd4ea7b4a2d60af0c84eda69 Mon Sep 17 00:00:00 2001
From: Karim Abou Zeid <karim23697@gmail.com>
Date: Tue, 29 Mar 2016 18:36:46 +0200
Subject: [PATCH] Fixed another NPE.

---
 .../kabouzeid/gramophone/service/MusicService.java | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java b/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
index df35e211..ad38f53f 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
@@ -832,10 +832,16 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
     }
 
     public int seek(int millis) {
-        int newPosition = playback.seek(millis);
-        savePositionInTrack();
-        throttledPublicPlayStateChangedNotifier.scheduleIntent();
-        return newPosition;
+        synchronized (this) {
+            try {
+                int newPosition = playback.seek(millis);
+                savePositionInTrack();
+                throttledPublicPlayStateChangedNotifier.scheduleIntent();
+                return newPosition;
+            } catch (Exception e) {
+                return -1;
+            }
+        }
     }
 
     public void cycleRepeatMode() {