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 init race condition, thanks to @dead this closes #21

Browse Source
This commit is contained in:
R. Aidan Campbell 2016-03-12 18:48:47 -05:00
parent 15e00aeff9
commit cce49d66b2
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
static/js/index.js
View File

@ -31,23 +31,23 @@ function updateBitrateField() {
} }
function moduleDidLoad() { function moduleDidLoad() {
if(!myUniqueid) {
console.log("Failed to get uniqueId. Generating new one");
myUniqueid = uniqueid();
storeData('uniqueid', myUniqueid, null);
}
if(!pairingCert) { // we couldn't load a cert. Make one. if(!pairingCert) { // we couldn't load a cert. Make one.
console.log("Failed to load local cert. Generating new one"); console.log("Failed to load local cert. Generating new one");
sendMessage('makeCert', []).then(function (cert) { sendMessage('makeCert', []).then(function (cert) {
storeData('cert', cert, null); storeData('cert', cert, null);
pairingCert = cert; pairingCert = cert;
console.log("Generated new cert."); console.log("Generated new cert.");
if(!myUniqueid) { // if we didn't have a cert, then we probably don't have a unique ID either. so let's do that too. }).then(function (ret) {
console.log("Failed to get uniqueId. Generating new one"); sendMessage('httpInit', [pairingCert.cert, pairingCert.privateKey, myUniqueid]);
myUniqueid = uniqueid();
console.log("genereated new uniqueId");
storeData('uniqueid', myUniqueid, null);
sendMessage('httpInit', [pairingCert.cert, pairingCert.privateKey, myUniqueid]).then(function (ret) {
snackbarLog('Initialization complete.');
});
}
}); });
} else { // both branches execure the httpInit function, but we're skipping this one if we haven't generated things yet. }
else {
sendMessage('httpInit', [pairingCert.cert, pairingCert.privateKey, myUniqueid]).then(function (ret) { sendMessage('httpInit', [pairingCert.cert, pairingCert.privateKey, myUniqueid]).then(function (ret) {
snackbarLog('Initialization complete.'); snackbarLog('Initialization complete.');
}); });