From a46fb7ba36b69c2102c5caa034970812489ef6d6 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Sat, 12 Jul 2014 16:16:18 -0700
Subject: [PATCH] Fix small race potential

---
 src/com/limelight/computers/ComputerManagerService.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/com/limelight/computers/ComputerManagerService.java b/src/com/limelight/computers/ComputerManagerService.java
index b9c6702b..c7e309a7 100644
--- a/src/com/limelight/computers/ComputerManagerService.java
+++ b/src/com/limelight/computers/ComputerManagerService.java
@@ -48,12 +48,13 @@ public class ComputerManagerService extends Service {
 	private ServiceConnection discoveryServiceConnection = new ServiceConnection() {
 		public void onServiceConnected(ComponentName className, IBinder binder) {
 			synchronized (discoveryServiceConnection) {
-				discoveryBinder = ((DiscoveryService.DiscoveryBinder)binder);
+				DiscoveryService.DiscoveryBinder privateBinder = ((DiscoveryService.DiscoveryBinder)binder);
 				
 				// Set us as the event listener
-				discoveryBinder.setListener(createDiscoveryListener());
+				privateBinder.setListener(createDiscoveryListener());
 				
 				// Signal a possible waiter that we're all setup
+				discoveryBinder = privateBinder;
 				discoveryServiceConnection.notifyAll();
 			}
 		}