moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2025-07-20 03:23:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix streaming on old servers

Browse Source
This commit is contained in:
Cameron Gutman 2019-07-05 21:28:21 -07:00
parent 71aadfa2f5
commit 0afda10bcb
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
moonlight-common/src/main/java/com/limelight/nvstream/NvConnection.java
View File

@ -95,11 +95,8 @@ public class NvConnection {
return false; return false;
} }
// May be missing for older servers
context.serverGfeVersion = h.getGfeVersion(serverInfo); 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) { if (h.getPairState(serverInfo) != PairingManager.PairState.PAIRED) {
context.connListener.displayMessage("Device not paired with computer"); context.connListener.displayMessage("Device not paired with computer");

4
moonlight-common/src/main/jni/moonlight-core/callbacks.c
View File

@ -409,7 +409,7 @@ Java_com_limelight_nvstream_jni_MoonBridge_startConnection(JNIEnv *env, jclass c
SERVER_INFORMATION serverInfo = { SERVER_INFORMATION serverInfo = {
.address = (*env)->GetStringUTFChars(env, address, 0), .address = (*env)->GetStringUTFChars(env, address, 0),
.serverInfoAppVersion = (*env)->GetStringUTFChars(env, appVersion, 0), .serverInfoAppVersion = (*env)->GetStringUTFChars(env, appVersion, 0),
.serverInfoGfeVersion = (*env)->GetStringUTFChars(env, gfeVersion, 0), .serverInfoGfeVersion = gfeVersion ? (*env)->GetStringUTFChars(env, gfeVersion, 0) : NULL,
}; };
STREAM_CONFIGURATION streamConfig = { STREAM_CONFIGURATION streamConfig = {
.width = width, .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, address, serverInfo.address);
(*env)->ReleaseStringUTFChars(env, appVersion, serverInfo.serverInfoAppVersion); (*env)->ReleaseStringUTFChars(env, appVersion, serverInfo.serverInfoAppVersion);
if (gfeVersion != NULL) {
(*env)->ReleaseStringUTFChars(env, gfeVersion, serverInfo.serverInfoGfeVersion); (*env)->ReleaseStringUTFChars(env, gfeVersion, serverInfo.serverInfoGfeVersion);
}
return ret; return ret;
} }

2
moonlight-common/src/main/jni/moonlight-core/moonlight-common-c

@ -1 +1 @@
Subproject commit 801aaf43d6124da294a8c97e5b67e966f1b4edbf Subproject commit 6245934462d9639680d7f6a007df25627b9b3719