1 files changed, 7 insertions, 10 deletions
diff --git a/main/src/cgeo/geocaching/utils/StartableHandlerThread.java b/main/src/cgeo/geocaching/utils/StartableHandlerThread.java
index 152badc..08300de 100644
--- a/main/src/cgeo/geocaching/utils/StartableHandlerThread.java
+++ b/main/src/cgeo/geocaching/utils/StartableHandlerThread.java
@@ -1,14 +1,15 @@
 package cgeo.geocaching.utils;
 
-import android.content.Context;
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.os.Message;
 import org.eclipse.jdt.annotation.NonNull;
 import rx.Subscriber;
 import rx.functions.Action0;
 import rx.subscriptions.Subscriptions;
 
+import android.content.Context;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Message;
+
 /**
  * Derivated class of {@link android.os.HandlerThread} with an exposed handler and a start/stop mechanism
  * based on subscriptions.
@@ -56,13 +57,9 @@ public class StartableHandlerThread extends HandlerThread {
         this(name, priority, null);
     }
 
-    public Handler getHandler() {
+    public synchronized Handler getHandler() {
         if (handler == null) {
-            synchronized(this) {
-                if (handler == null) {
-                    handler = new StartableHandler();
-                }
-            }
+            handler = new StartableHandler();
         }
         return handler;
     }