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

fixed bug in pairing

Browse Source
This commit is contained in:
R. Aidan Campbell 2016-08-26 23:30:46 -04:00
parent 36367f69c3
commit 7f1caff2e8
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
static/js/index.js
View File

@ -163,14 +163,14 @@ function pairTo(nvhttpHost, onSuccess, onFailure) {
var pairingDialog = document.querySelector('#pairingDialog');
$('#pairingDialogText').html('Please enter the number ' + randomNumber + ' on the GFE dialog on the computer. This dialog will be dismissed once complete');
pairingDialog.showModal();
console.log('sending pairing request to ' + nvhttpHost.address + ' with random number ' + randomNumber);
console.log('sending pairing request to ' + _api.address + ' with random number ' + randomNumber);
_api.pair(randomNumber).then(function (paired) {
if (!paired) {
if (_api.currentGame != 0) {
$('#pairingDialogText').html('Error: ' + nvhttpHost.address + ' is in app. Cannot pair until the app is stopped.');
$('#pairingDialogText').html('Error: ' + _api.address + ' is in app. Cannot pair until the app is stopped.');
} else {
$('#pairingDialogText').html('Error: failed to pair with ' + nvhttpHost.address + '. failure reason unknown.');
$('#pairingDialogText').html('Error: failed to pair with ' + _api.address + '. failure reason unknown.');
}
console.log('failed API object: ');
console.log(_api.toString());
@ -182,14 +182,14 @@ function pairTo(nvhttpHost, onSuccess, onFailure) {
pairingDialog.close();
onSuccess();
}, function (failedPairing) {
snackbarLog('Failed pairing to: ' + nvhttpHost.address);
snackbarLog('Failed pairing to: ' + _api.address);
console.log('pairing failed, and returned ' + failedPairing);
console.log('failed API object: ');
console.log(_api.toString());
onFailure();
});
}, function (failedRefreshInfo) {
snackbarLog('Failed to connect to ' + nvhttpHost.address + '! Are you sure the host is on?');
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());
@ -259,9 +259,13 @@ function continueAddHost() {
var _nvhttpHost = new NvHTTP(inputHost, myUniqueid, inputHost);
pairTo(_nvhttpHost,
function() {
addHostToGrid(_nvhttpHost);
saveHosts();
document.querySelector('#addHostDialog').close();
_nvhttpHost.refreshServerInfo().then(function (onSuccess) {
addHostToGrid(_nvhttpHost);
saveHosts();
document.querySelector('#addHostDialog').close();
}, function (onFailure) {
console.log('FAILURE!');
});
},
function() {
snackbarLog('pairing to ' + inputHost + ' failed!');

2
static/js/utils.js
View File

@ -150,7 +150,7 @@ NvHTTP.prototype = {
return false;
}
if(this.serverUid != $root.find('uniqueid').text().trim() && this.serverUid != null) {
if(this.serverUid != $root.find('uniqueid').text().trim() && this.serverUid != "") {
// if we received a UID that isn't the one we expected, fail.
return false;
}