merged

1 files changed, 6 insertions, 5 deletions

diff --git a/pyLoadCore.py b/pyLoadCore.py
index 1951d6db1..97ca25ffd 100755
--- a/pyLoadCore.py
+++ b/pyLoadCore.py
@@ -302,11 +302,6 @@ class Core(object):
         elif start < now and end < now and start > end: return True

         else: return False

         

-    #~ def init_webserver(self):

-        #~ self.webserver = WebServer(self)

-        #~ if self.config['webinterface']['activated']:

-            #~ self.webserver.start()

-            

     ####################################

     ########## XMLRPC Methods ##########

     ####################################

@@ -371,6 +366,12 @@ class ServerMethods():
     def unpause_server(self):

         self.core.thread_list.pause = False

     

+    def toggle_pause(self):

+        if self.core.thread_list.pause:

+            self.core.thread_list.pause = False

+        else:

+            self.core.thread_list.pause = True

+    

     def status_server(self):

         status = {}

         status['pause'] = self.core.thread_list.pause