From 9b0daa26dbaebb70723d309f0bc4fb62bd3a0043 Mon Sep 17 00:00:00 2001
From: nickdu <nick@nickdu.com>
Date: Thu, 10 May 2012 15:25:03 +1000
Subject: Fix when browser starts up proxy is not set correctly issue

---
 src/chrome/content/proxy.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src')

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;
 	}
 }
-- 
cgit v1.2.3

351eb6b76cfe'>refs</a><a class='active' href='/lcd4linux.git/log/drv_Sample.c?showmsg=1&amp;follow=1'>log</a><a href='/lcd4linux.git/tree/drv_Sample.c?id=475fdb43971a24c01db6d8bf5cb4351eb6b76cfe'>tree</a><a href='/lcd4linux.git/commit/drv_Sample.c?id=475fdb43971a24c01db6d8bf5cb4351eb6b76cfe&amp;follow=1'>commit</a><a href='/lcd4linux.git/diff/drv_Sample.c?id=475fdb43971a24c01db6d8bf5cb4351eb6b76cfe&amp;follow=1'>diff</a><a href='/lcd4linux.git/stats/drv_Sample.c'>stats</a></td><td class='form'><form class='right' method='get' action='/lcd4linux.git/log/drv_Sample.c'>
<input type='hidden' name='id' value='475fdb43971a24c01db6d8bf5cb4351eb6b76cfe'/><input type='hidden' name='showmsg' value='1'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/lcd4linux.git/log/?id=475fdb43971a24c01db6d8bf5cb4351eb6b76cfe&amp;showmsg=1&amp;follow=1'>root</a>/<a href='/lcd4linux.git/log/drv_Sample.c?id=475fdb43971a24c01db6d8bf5cb4351eb6b76cfe&amp;showmsg=1&amp;follow=1'>drv_Sample.c</a> (<a href='/lcd4linux.git/log/drv_Sample.c?id=475fdb43971a24c01db6d8bf5cb4351eb6b76cfe&amp;showmsg=1'>unfollow</a>)</div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/lcd4linux.git/log/drv_Sample.c?id=475fdb43971a24c01db6d8bf5cb4351eb6b76cfe&amp;follow=1'>Collapse</a>)</th><th class='left'>Author</th><th class='left'>Files</th><th class='left'>Lines</th></tr>
<tr class='logheader'><td><span title='2010-11-27 14:35:10 +0000'>2010-11-27</span></td><td class='logsubject'><a href='/lcd4linux.git/commit/timer.h?id=00db296b07befe1b511af73b00303c536cea0c6c&amp;follow=1'>finished commenting the timer code</a></td><td>mzuther</td><td>2</td><td><span class='deletions'>-46</span>/<span class='insertions'>+138</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1135 3ae390bd-cb1e-0410-b409-cd5a39f66f1f


</td></tr>
<tr class='logheader'><td><span title='2010-11-20 20:22:05 +0000'>2010-11-20</span></td><td class='logsubject'><a href='/lcd4linux.git/commit/timer.h?id=20e4961f9eb3ea712a4d101d5984a6e0e68a23bd&amp;follow=1'>started commenting the timer code</a></td><td>mzuther</td><td>5</td><td><span class='deletions'>-52</span>/<span class='insertions'>+170</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
I'm not done yet, but my system is currently very unstable, and I
don't want the changes to get lost... :(


git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1134 3ae390bd-cb1e-0410-b409-cd5a39f66f1f


</td></tr>
<tr class='logheader'><td><span title='2010-11-19 09:02:34 +0000'>2010-11-19</span></td><td class='logsubject'><a href='/lcd4linux.git/commit/lcd4linux.conf.sample?id=4447e1d46ca5cdb1839c9ece0426fd26db1b2817&amp;follow=1'>Added brightness support for GLCD2USB</a></td><td>harbaum</td><td>5</td><td><span class='deletions'>-28</span>/<span class='insertions'>+8014</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1133 3ae390bd-cb1e-0410-b409-cd5a39f66f1f


</td></tr>