diff --git a/moonlight-common/src/com/limelight/nvstream/NvConnection.java b/moonlight-common/src/com/limelight/nvstream/NvConnection.java index 32130af2..40d4b7d5 100644 --- a/moonlight-common/src/com/limelight/nvstream/NvConnection.java +++ b/moonlight-common/src/com/limelight/nvstream/NvConnection.java @@ -197,18 +197,15 @@ public class NvConnection { } } - // Update the running status of the app - app.setIsRunning(h.getCurrentGame(serverInfo) == app.getAppId()); - // If there's a game running, resume it if (h.getCurrentGame(serverInfo) != 0) { try { - if (app.getIsRunning()) { + if (h.getCurrentGame(serverInfo) == app.getAppId()) { if (!h.resumeApp(context)) { context.connListener.displayMessage("Failed to resume existing session"); return false; } - } else if (h.getCurrentGame(serverInfo) != app.getAppId()) { + } else { return quitAndLaunch(h, app); } } catch (GfeHttpResponseException e) { diff --git a/moonlight-common/src/com/limelight/nvstream/http/NvApp.java b/moonlight-common/src/com/limelight/nvstream/http/NvApp.java index 5e1cb221..b870b0a3 100644 --- a/moonlight-common/src/com/limelight/nvstream/http/NvApp.java +++ b/moonlight-common/src/com/limelight/nvstream/http/NvApp.java @@ -5,7 +5,6 @@ import com.limelight.LimeLog; public class NvApp { private String appName = ""; private int appId; - private boolean isRunning; private boolean initialized; public NvApp() {} @@ -38,14 +37,6 @@ public class NvApp { this.initialized = true; } - public void setIsRunning(String isRunning) { - this.isRunning = isRunning.equals("1"); - } - - public void setIsRunning(boolean isRunning) { - this.isRunning = isRunning; - } - public String getAppName() { return this.appName; } @@ -54,10 +45,6 @@ public class NvApp { return this.appId; } - public boolean getIsRunning() { - return this.isRunning; - } - public boolean isInitialized() { return this.initialized; } diff --git a/moonlight-common/src/com/limelight/nvstream/http/NvHTTP.java b/moonlight-common/src/com/limelight/nvstream/http/NvHTTP.java index 166fb0af..d3683107 100644 --- a/moonlight-common/src/com/limelight/nvstream/http/NvHTTP.java +++ b/moonlight-common/src/com/limelight/nvstream/http/NvHTTP.java @@ -516,8 +516,6 @@ public class NvHTTP { app.setAppName(xpp.getText().trim()); } else if (currentTag.peek().equals("ID")) { app.setAppId(xpp.getText().trim()); - } else if (currentTag.peek().equals("IsRunning")) { - app.setIsRunning(xpp.getText().trim()); } break; } @@ -536,7 +534,7 @@ public class NvHTTP { // Remove uninitialized apps if (!app.isInitialized()) { - LimeLog.warning("GFE returned incomplete app: "+app.getAppId()+" "+app.getAppName()+" "+app.getIsRunning()); + LimeLog.warning("GFE returned incomplete app: "+app.getAppId()+" "+app.getAppName()); i.remove(); } }