Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch '1.9.1' into devel

Browse source 
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/models/MusicDir.php
	python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py
This commit is contained in:
martin 2011-10-04 13:59:27 -04:00
commit 5190a0c24c
7 changed files with 46 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
python_apps/show-recorder/recorder.py
View file

@ -258,7 +258,8 @@ class CommandListener(Thread):
#remove show from shows to record.
del self.shows_to_record[start_time]
self.time_till_next_show = 3600
time_till_next_show = self.get_time_till_next_show()
self.time_till_next_show = time_till_next_show
except Exception,e :
self.logger.error(e)
else:
@ -297,6 +298,7 @@ class CommandListener(Thread):
# start recording
self.start_record()
except Exception, e:
self.logger.info(e)
time.sleep(3)
loops += 1