From 8f3eecd9809b4de898a2ea175144c4649573775f Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Sun, 21 May 2017 14:42:09 -0700
Subject: [PATCH] Remove starting app stage from under the lock

---
 .../com/limelight/nvstream/NvConnection.java  | 72 +++++++++----------
 1 file changed, 34 insertions(+), 38 deletions(-)

diff --git a/moonlight-common/src/main/java/com/limelight/nvstream/NvConnection.java b/moonlight-common/src/main/java/com/limelight/nvstream/NvConnection.java
index 7d4132b7..5eb26d40 100644
--- a/moonlight-common/src/main/java/com/limelight/nvstream/NvConnection.java
+++ b/moonlight-common/src/main/java/com/limelight/nvstream/NvConnection.java
@@ -213,53 +213,49 @@ public class NvConnection {
 		
 		return true;
 	}
-	
-	private void establishConnection() {
-		String appName = context.streamConfig.getApp().getAppName();
-
-		try {
-			context.serverAddress = InetAddress.getByName(host);
-		} catch (UnknownHostException e) {
-			context.connListener.connectionTerminated(-1);
-			return;
-		}
-
-		context.connListener.stageStarting(appName);
-
-		try {
-			startApp();
-			context.connListener.stageComplete(appName);
-		} catch (Exception e) {
-			e.printStackTrace();
-			context.connListener.displayMessage(e.getMessage());
-			context.connListener.stageFailed(appName, 0);
-			return;
-		}
-
-		ByteBuffer ib = ByteBuffer.allocate(16);
-		ib.putInt(context.riKeyId);
-
-		MoonBridge.startConnection(context.serverAddress.getHostAddress(),
-				context.serverAppVersion, context.serverGfeVersion,
-				context.negotiatedWidth, context.negotiatedHeight,
-				context.negotiatedFps, context.streamConfig.getBitrate(),
-				context.streamConfig.getRemote(), context.streamConfig.getAudioConfiguration(),
-				context.streamConfig.getHevcSupported(), context.riKey.getEncoded(), ib.array(),
-                context.videoCapabilities);
-	}
 
 	public void start(final AudioRenderer audioRenderer, final VideoDecoderRenderer videoDecoderRenderer, final NvConnectionListener connectionListener)
 	{
 		new Thread(new Runnable() {
 			public void run() {
+				context.connListener = connectionListener;
+				context.videoCapabilities = videoDecoderRenderer.getCapabilities();
+
+				String appName = context.streamConfig.getApp().getAppName();
+
+				try {
+					context.serverAddress = InetAddress.getByName(host);
+				} catch (UnknownHostException e) {
+					context.connListener.connectionTerminated(-1);
+					return;
+				}
+
+				context.connListener.stageStarting(appName);
+
+				try {
+					startApp();
+					context.connListener.stageComplete(appName);
+				} catch (Exception e) {
+					e.printStackTrace();
+					context.connListener.displayMessage(e.getMessage());
+					context.connListener.stageFailed(appName, 0);
+					return;
+				}
+
+				ByteBuffer ib = ByteBuffer.allocate(16);
+				ib.putInt(context.riKeyId);
+
 				// Moonlight-core is not thread-safe with respect to connection start and stop, so
 				// we must not invoke that functionality in parallel.
 				synchronized (MoonBridge.class) {
 					MoonBridge.setupBridge(videoDecoderRenderer, audioRenderer, connectionListener);
-					context.connListener = connectionListener;
-					context.videoCapabilities = videoDecoderRenderer.getCapabilities();
-
-					establishConnection();
+					MoonBridge.startConnection(context.serverAddress.getHostAddress(),
+							context.serverAppVersion, context.serverGfeVersion,
+							context.negotiatedWidth, context.negotiatedHeight,
+							context.negotiatedFps, context.streamConfig.getBitrate(),
+							context.streamConfig.getRemote(), context.streamConfig.getAudioConfiguration(),
+							context.streamConfig.getHevcSupported(), context.riKey.getEncoded(), ib.array(),
+							context.videoCapabilities);
 				}
 			}
 		}).start();