diff --git a/CHANGELOG b/CHANGELOG index bb722c4..5c48f58 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -2016-04-xx 1.2.8 Password-free IP mask added into advanced configuration +2016-xx-xx 1.2.8 Password-free IP mask added into advanced configuration Fix for login on iOS devices Logout link added diff --git a/synology/INFO b/synology/INFO index 4f29005..fb75848 100644 --- a/synology/INFO +++ b/synology/INFO @@ -1,5 +1,5 @@ package="tvstreamrecord" -version="1.2.7a" +version="1.2.7b" maintainer="Pavion" description="Program to record TV streams. Python required. Server runs at port 8030 (changeable)" reloadui="yes" diff --git a/tvstreamrecord.py b/tvstreamrecord.py index 1bb1357..480d046 100644 --- a/tvstreamrecord.py +++ b/tvstreamrecord.py @@ -59,7 +59,7 @@ def total(timedelta): localdate = "%d.%m.%Y" dayshown = datetime.combine(date.today(), time.min) shutdown = False -version = '1.2.7a' +version = '1.2.7b' @route('/live/') def server_static9(filename): @@ -1124,8 +1124,6 @@ def cleanProcess(self): print ("FFMPEG Record '%s' had to be killed. R.I.P." % self.name) else: print ("FFMPEG Record '%s' had to be terminated." % self.name) - except WindowsError: - pass except: print ("FFMPEG Record '%s' termination error, process might be running" % self.name) if not self.process==None: