From 246fb69050525b29f94b5696afb787ab224f61d7 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Mon, 4 Apr 2016 01:18:14 -0400
Subject: [PATCH] Fix dangerous connection teardown ordering leading to native
 crashes in jnienet

---
 .../src/com/limelight/nvstream/NvConnection.java  | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/moonlight-common/src/com/limelight/nvstream/NvConnection.java b/moonlight-common/src/com/limelight/nvstream/NvConnection.java
index bf9c5520..0d740434 100644
--- a/moonlight-common/src/com/limelight/nvstream/NvConnection.java
+++ b/moonlight-common/src/com/limelight/nvstream/NvConnection.java
@@ -81,21 +81,22 @@ public class NvConnection {
 	
 	public void stop()
 	{
-		if (videoStream != null) {
-			videoStream.abort();
+		if (inputStream != null) {
+			inputStream.abort();
+			inputStream = null;
 		}
+		
 		if (audioStream != null) {
 			audioStream.abort();
 		}
 		
+		if (videoStream != null) {
+			videoStream.abort();
+		}
+
 		if (controlStream != null) {
 			controlStream.abort();
 		}
-		
-		if (inputStream != null) {
-			inputStream.abort();
-			inputStream = null;
-		}
 	}
 	
 	private boolean startApp() throws XmlPullParserException, IOException