Merge branch '2.1.x' into devel

python_apps/pypo/pypofetch.py

@@ -80,7 +80,6 @@ class PypoFetch(Thread):
             self.logger.info("Handling command: " + command)
         
             if command == 'update_schedule':
-                self.last_update_schedule_timestamp = time.time()
                 self.schedule_data  = m['schedule']
                 self.process_schedule(self.schedule_data)
             elif command == 'update_stream_setting':
@@ -405,6 +404,7 @@ class PypoFetch(Thread):
      - runs the cleanup routine, to get rid of unused cached files
     """
     def process_schedule(self, schedule_data):      
+	self.last_update_schedule_timestamp = time.time()
         self.logger.debug(schedule_data)
         media = schedule_data["media"]
         media_filtered = {}