Skip to content

Commit

Permalink
WindowsError removed
Browse files Browse the repository at this point in the history
  • Loading branch information
Pavion committed Jul 19, 2016
1 parent 868e5a4 commit 76188ff
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion synology/INFO
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 1 addition & 3 deletions tvstreamrecord.py
Original file line number Diff line number Diff line change
Expand Up @@ -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/<filename>')
def server_static9(filename):
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 76188ff

Please sign in to comment.