moonlight-stream/moonlight-chrome
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-chrome.git synced 2025-08-17 16:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid calling refreshServerInfo() before selecting an address

Browse Source
This commit is contained in:
Cameron Gutman 2016-08-27 17:26:46 -07:00
parent 029f92f821
commit 344dcc0bc3
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
static/js/index.js
View File

@ -170,7 +170,14 @@ function pairTo(nvhttpHost, onSuccess, onFailure) {
}
var _api = nvhttpHost;
_api.refreshServerInfo().then(function (ret) {
_api.pollServer(function (ret) {
if (!_api.online) {
snackbarLog('Failed to connect to ' + _api.address + '! Are you sure the host is on?');
console.log(_api.toString());
onFailure();
return;
}
if (_api.paired) {
onSuccess();
return;
@ -205,12 +212,6 @@ function pairTo(nvhttpHost, onSuccess, onFailure) {
console.log(_api.toString());
onFailure();
});
}, function (failedRefreshInfo) {
snackbarLog('Failed to connect to ' + _api.address + '! Are you sure the host is on?');
console.log('Returned error was: ' + failedRefreshInfo);
console.log('failed API object: ');
console.log(_api.toString());
onFailure();
});
}
@ -279,19 +280,17 @@ function addHostToGrid(host) {
function continueAddHost() {
var inputHost = $('#dialogInputHost').val();
var _nvhttpHost = new NvHTTP(inputHost, myUniqueid, inputHost);
pairTo(_nvhttpHost,
function() {
_nvhttpHost.refreshServerInfo().then(function (onSuccess) {
addHostToGrid(_nvhttpHost);
saveHosts();
document.querySelector('#addHostDialog').close();
}, function (onFailure) {
console.log('FAILURE!');
});
beginBackgroundPollingOfHost(_nvhttpHost);
addHostToGrid(_nvhttpHost);
saveHosts();
document.querySelector('#addHostDialog').close();
},
function() {
snackbarLog('pairing to ' + inputHost + ' failed!');
});
});
}
function confirmUnpairHost(sourceEvent) {
@ -584,6 +583,10 @@ function stopGameWithConfirmation() {
}
function stopGame(callbackFunction) {
if (!api.paired) {
return;
}
api.refreshServerInfo().then(function (ret) {
api.getAppById(api.currentGame).then(function (runningApp) {
if (!runningApp) {