Merge branch 'testing' of https://git.deck.sh/Interfaz/ff into testing

ippigeon.py

@@ -276,6 +276,7 @@ if __name__ == '__main__':
             killme = manager.Value('d', 0)
             #killme = False
             # launch background UI app as process
+            util.clear_fwll()
             p = Process(target=taskbartool.background, args=(displaydata,settings,killme))
             p.start()   
             #p.join() # not a foreground job, so let's not join it
@@ -289,10 +290,3 @@ if __name__ == '__main__':
             counter = 0
             while(keeprunning):
                 mainloop(pool)
-
-
-
-
-
-
-

panel.py

@@ -242,8 +242,7 @@ class ServerPanel(wx.Panel):
     def on_stop(self, event):
         fprint('in on_stop')
         settings["running"] = False
-        # JANK JANK
-        util.run_cmd('Remove-NetFirewallRule -Group "IPPigeon"')
+        util.clear_fwll()
 
     def on_window(self, event):
         fprint("open settings")

util.py

@@ -118,3 +118,7 @@ class Logger(object):
         
     def flush(self):
         print("", end="")
+
+def clear_fwll():
+    if win32:
+        run_cmd('Remove-NetFirewallRule -Group "IPPigeon"')