aboutsummaryrefslogtreecommitdiffstats
path: root/src/chrome/content
diff options
context:
space:
mode:
authorjmccrohan <jmccrohan@gmail.com>2012-05-10 16:42:34 -0700
committerjmccrohan <jmccrohan@gmail.com>2012-05-10 16:42:34 -0700
commite5769bc2e3ae6377fc5c8f19adb876c064463766 (patch)
tree8573255a41a5496efd8d7728bb25484a3b552371 /src/chrome/content
parent418e6ab9be9945ad0865a5d5760296bfb4e7dc71 (diff)
parent9b0daa26dbaebb70723d309f0bc4fb62bd3a0043 (diff)
downloadMultiproxy-Switch-e5769bc2e3ae6377fc5c8f19adb876c064463766.tar.gz
Merge pull request #2 from nickdu/master
Restart issue has been fixed
Diffstat (limited to '')
-rw-r--r--src/chrome/content/proxy.js10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/chrome/content/proxy.js b/src/chrome/content/proxy.js
index 8c94d0f..85664dc 100644
--- a/src/chrome/content/proxy.js
+++ b/src/chrome/content/proxy.js
@@ -65,9 +65,11 @@ function mproxy_initProxy(event){
//Populate Proxy List
mproxy_populateList();
- //Set Last Proxy Selected
- if(gSwitchP_List != null)
- gSwitchP_LastItem = gSwitchP_List.selectedItem;
+ //Set Last Proxy Selected
+ if (gSwitchP_List != null) {
+ gSwitchP_List.selectedItem.value = gSwitchP_Prefs.getCharPref("mproxy.proxy.current");
+ gSwitchP_LastItem = gSwitchP_List.selectedItem;
+ }
//Add Preferences Listener
var oProxyObserver = {
@@ -96,7 +98,7 @@ oPrefBranch.addObserver("mproxy.proxy.rdf.lastupdate", oProxyObserver, false);
// Start Anon Rotation
//setTimeout("mproxy_anon_nextProxy()", 1000);
-
+ mproxy_setProxy(true);
gSwitchP_Loaded = true;
}
}