Merge pull request #2 from nickdu/master

Restart issue has been fixed

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;

 	}

 }