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

ippigeon.py

@@ -250,7 +250,7 @@ if __name__ == '__main__':
     sys.stderr = Logger(filename=find_data_file("output.log"))
     with Manager() as manager:
         with Pool(processes=5) as pool:
-        
+            
             with open(find_data_file('config.yml'), 'r') as fileread:
                 #global config
                 config = yaml.safe_load(fileread)
@@ -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
@@ -288,11 +289,4 @@ if __name__ == '__main__':
             # launch loop - non-blocking!
             counter = 0
             while(keeprunning):
-                mainloop(pool)
+                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.clear_fwll()
-        util.run_cmd('Remove-NetFirewallRule -Group "IPPigeon"')
 
     def on_window(self, event):
         fprint("open settings")

util.py

@@ -117,4 +117,8 @@ class Logger(object):
             sleep(0)
         
     def flush(self):
-        print("", end="")
+        print("", end="")
+
+def clear_fwll():
+    if win32:
+        run_cmd('Remove-NetFirewallRule -Group "IPPigeon"')