From 0f5a6cec871d30f3f89bd7b5141fcda07611af9b Mon Sep 17 00:00:00 2001 From: Nicolas Date: Tue, 6 Dec 2016 11:47:27 -0500 Subject: [PATCH] save the server if connection is a success I have a problem with getSavedCustomPTServer() debug: Loading custom server from storage settings.js:148 custom PT is defined http://xxx.xxx.xxx.xxx:8088 but it always returns "" (the last line of the method) --- app/js/settings.js | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/app/js/settings.js b/app/js/settings.js index 98679765..5dc40d7d 100644 --- a/app/js/settings.js +++ b/app/js/settings.js @@ -85,6 +85,7 @@ function connectToPTServer(address){ document.getElementById('ptServerPreloader').style.opacity = 0 }) ipcRenderer.on('connect-ptserver-success',function(event){ + saveCustomPTServer(address); document.getElementById('ptServerPreloader').style.opacity = 0 $('#serverSuccess').removeClass('hide') document.getElementById('ptRoom').focus() @@ -138,27 +139,29 @@ function getHandshakeUser(){ } function getSavedCustomPTServer(){ - var storage = remote.getGlobal('storage'); + console.log("Loading custom server from storage"); + var storage = remote.getGlobal('storage'); + var address = ""; storage.get('plex-together-custom-settings', function(error, data) { if (error) throw error; - if(data.customPTServer != null){ - return data.customPTServer + if(data.customPTServer != typeof undefined){ + console.log("custom PT is defined " + data.customPTServer); + address = data.customPTServer; }else{ - //if key doesn't exists, create one with empty value + //if key doesn't exists, create one with empty value storage.set('plex-together-custom-settings',{'customPTServer':""}, function(error) { if (error) throw error; }); - return "" } }); - //if storage fail, return empty - return "" + return address; } function saveCustomPTServer(address){ + console.log("Saving custom server " + address + " to storage"); var storage = remote.getGlobal('storage'); storage.set('plex-together-custom-settings',{'customPTServer':address}, function(error) { if (error) throw error; }); - return + return address }