Remove race condition for access to eventHandler

1 files changed, 10 insertions, 16 deletions

diff --git a/src/github/daneren2005/dsub/service/DownloadServiceLifecycleSupport.java b/src/github/daneren2005/dsub/service/DownloadServiceLifecycleSupport.java
index e0019559..4e3ec29c 100644
--- a/src/github/daneren2005/dsub/service/DownloadServiceLifecycleSupport.java
+++ b/src/github/daneren2005/dsub/service/DownloadServiceLifecycleSupport.java
@@ -117,6 +117,16 @@ public class DownloadServiceLifecycleSupport {
 				Looper.prepare();
 				eventLooper = Looper.myLooper();
 				eventHandler = new Handler(eventLooper);
+
+				// Deserialize queue before starting looper
+				try {
+					lock.lock();
+					deserializeDownloadQueueNow();
+					setup.set(true);
+				} finally {
+					lock.unlock();
+				}
+
 				Looper.loop();
 			}
 		}).start();
@@ -176,8 +186,6 @@ public class DownloadServiceLifecycleSupport {
         commandFilter.addAction(DownloadServiceImpl.CMD_NEXT);
         downloadService.registerReceiver(intentReceiver, commandFilter);
 
-        deserializeDownloadQueue();
-
         new CacheCleaner(downloadService, downloadService).clean();
     }
 
@@ -248,20 +256,6 @@ public class DownloadServiceLifecycleSupport {
 		FileUtil.serialize(downloadService, state, FILENAME_DOWNLOADS_SER);
     }
 
-	private void deserializeDownloadQueue() {
-		eventHandler.post(new Runnable() {
-			@Override
-			public void run() {
-				try {
-					lock.lock();
-					deserializeDownloadQueueNow();
-					setup.set(true);
-				} finally {
-					lock.unlock();
-				}
-			}
-    	});
-	}
     private void deserializeDownloadQueueNow() {
        State state = FileUtil.deserialize(downloadService, FILENAME_DOWNLOADS_SER);
         if (state == null) {