pac interface change

yinghuocho · May 8, 2016 · d513e23 · d513e23
1 parent 0491f77
commit d513e23
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/client/main.go b/client/main.go
@@ -560,7 +560,9 @@ func (c *fireflyClient) _main() {
 	}
 	pacURL := c.ui.handle(pacFilename(), pacHandler(c.httpListener.Addr().String()))
 	enablePAC(pacURL)
-	c.addExitFunc(disablePAC)
+	c.addExitFunc(func() {
+		disablePAC(pacURL)
+	})
 
 	// systray
 	c.addExitFunc(systray.Quit)

diff --git a/client/pac.go b/client/pac.go
@@ -87,10 +87,10 @@ func enablePAC(pacURL string) {
 	atomic.StoreInt32(&isPACOn, 1)
 }
 
-func disablePAC() {
+func disablePAC(pacURL string) {
 	if atomic.CompareAndSwapInt32(&isPACOn, 1, 0) {
 		log.Printf("Unsetting firefly as system proxy")
-		err := pac.Off()
+		err := pac.Off(pacURL)
 		if err != nil {
 			log.Printf("Unable to unset firefly as system proxy: %s", err)
 		}