From 0afda10bcb5681a9f13a2f3b9736361ac2266cca Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Fri, 5 Jul 2019 21:28:21 -0700
Subject: [PATCH] Fix streaming on old servers

---
 .../src/main/java/com/limelight/nvstream/NvConnection.java  | 5 +----
 moonlight-common/src/main/jni/moonlight-core/callbacks.c    | 6 ++++--
 .../src/main/jni/moonlight-core/moonlight-common-c          | 2 +-
 3 files changed, 6 insertions(+), 7 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 30bbb818..426b4e25 100644
--- a/moonlight-common/src/main/java/com/limelight/nvstream/NvConnection.java
+++ b/moonlight-common/src/main/java/com/limelight/nvstream/NvConnection.java
@@ -95,11 +95,8 @@ public class NvConnection {
 			return false;
 		}
 
+		// May be missing for older servers
 		context.serverGfeVersion = h.getGfeVersion(serverInfo);
-		if (context.serverGfeVersion == null) {
-			context.connListener.displayMessage("Server GFE version malformed");
-			return false;
-		}
 				
 		if (h.getPairState(serverInfo) != PairingManager.PairState.PAIRED) {
 			context.connListener.displayMessage("Device not paired with computer");
diff --git a/moonlight-common/src/main/jni/moonlight-core/callbacks.c b/moonlight-common/src/main/jni/moonlight-core/callbacks.c
index f379db39..c92b15e5 100644
--- a/moonlight-common/src/main/jni/moonlight-core/callbacks.c
+++ b/moonlight-common/src/main/jni/moonlight-core/callbacks.c
@@ -409,7 +409,7 @@ Java_com_limelight_nvstream_jni_MoonBridge_startConnection(JNIEnv *env, jclass c
     SERVER_INFORMATION serverInfo = {
             .address = (*env)->GetStringUTFChars(env, address, 0),
             .serverInfoAppVersion = (*env)->GetStringUTFChars(env, appVersion, 0),
-            .serverInfoGfeVersion = (*env)->GetStringUTFChars(env, gfeVersion, 0),
+            .serverInfoGfeVersion = gfeVersion ? (*env)->GetStringUTFChars(env, gfeVersion, 0) : NULL,
     };
     STREAM_CONFIGURATION streamConfig = {
             .width = width,
@@ -445,7 +445,9 @@ Java_com_limelight_nvstream_jni_MoonBridge_startConnection(JNIEnv *env, jclass c
 
     (*env)->ReleaseStringUTFChars(env, address, serverInfo.address);
     (*env)->ReleaseStringUTFChars(env, appVersion, serverInfo.serverInfoAppVersion);
-    (*env)->ReleaseStringUTFChars(env, gfeVersion, serverInfo.serverInfoGfeVersion);
+    if (gfeVersion != NULL) {
+        (*env)->ReleaseStringUTFChars(env, gfeVersion, serverInfo.serverInfoGfeVersion);
+    }
 
     return ret;
 }
\ No newline at end of file
diff --git a/moonlight-common/src/main/jni/moonlight-core/moonlight-common-c b/moonlight-common/src/main/jni/moonlight-core/moonlight-common-c
index 801aaf43..62459344 160000
--- a/moonlight-common/src/main/jni/moonlight-core/moonlight-common-c
+++ b/moonlight-common/src/main/jni/moonlight-core/moonlight-common-c
@@ -1 +1 @@
-Subproject commit 801aaf43d6124da294a8c97e5b67e966f1b4edbf
+Subproject commit 6245934462d9639680d7f6a007df25627b9b3719