termination speed up

Author: s-n-g

pyradio/log.py

@@ -43,11 +43,12 @@ def _do_i_print_last_char(self, first_print):
         return first_print
 
     def write(self, msg=None, suffix=None, counter=None, help_msg=False, error_msg=False, notify_function=None):
-        if self.asked_to_stop:
-            self.counter = None
-            return
         if self.cursesScreen:
             with self.lock:
+                if self.asked_to_stop:
+                    self.asked_to_stop = False
+                    self.counter = None
+                    return
                 #if logger.isEnabledFor(logging.DEBUG):
                 #    logger.debug('before ----------------------------')
                 #    logger.debug('msg = "{}"'.format(msg))
@@ -73,6 +74,7 @@ def write(self, msg=None, suffix=None, counter=None, help_msg=False, error_msg=F
                 #    logger.debug('self.counter = "{}"'.format(self.counter))
 
                 if self.asked_to_stop:
+                    self.asked_to_stop = False
                     self.counter = None
                     return
                 """ update main message """
@@ -97,6 +99,7 @@ def write(self, msg=None, suffix=None, counter=None, help_msg=False, error_msg=F
                 self._active_width = self.width
 
                 if self.asked_to_stop:
+                    self.asked_to_stop = False
                     self.counter = None
                     return
                 """ display suffix """
@@ -127,6 +130,7 @@ def write(self, msg=None, suffix=None, counter=None, help_msg=False, error_msg=F
                         logger.debug('Counter: {}'.format(self.counter))
 
                 if self.asked_to_stop:
+                    self.asked_to_stop = False
                     self.counter = None
                     return
                 """ display press ? """
@@ -144,6 +148,7 @@ def write(self, msg=None, suffix=None, counter=None, help_msg=False, error_msg=F
                         logger.debug('Press ? for help: no')
 
                 if self.asked_to_stop:
+                    self.asked_to_stop = False
                     self.counter = None
                     return
                 self.cursesScreen.refresh()

pyradio/radio.py

@@ -4347,7 +4347,8 @@ def keypress(self, char):
                             return
                         """ exit """
                         # stop updating the status bar
-                        self.log.asked_to_stop = True
+                        with self.log.lock:
+                            self.log.asked_to_stop = True
                         if self._cnf.dirty_playlist:
                             if self._cnf.auto_save_playlist:
                                 # save playlist and exit