mirror
/
bazarr
mirror of https://github.com/morpheus65535/bazarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/development' into development

This commit is contained in:
Louis Vézina 2019-10-15 11:04:36 -04:00
parent 983ffe2199 b7049c79ce
commit de1b28acb6
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bazarr/check_update.py
View File

@ -294,7 +294,8 @@ def request_json(url, **kwargs):
def updated(restart=True):
if settings.general.getboolean('update_restart') and restart:
try:
requests.get(bazarr_url + 'restart')
from main import restart
restart()
except requests.ConnectionError:
logging.info('BAZARR Restart failed, please restart Bazarr manualy')
updated(restart=False)

2
libs/pyprobe/ffprobeparsers.py
View File

@ -121,7 +121,7 @@ class SubtitleStreamParser(BaseParser):
"""Returns a string """
tags = data.get("tags", None)
if tags:
info = tags.get("language", None)
info = tags.get("language", None) or tags.get("LANGUAGE", None)
return info, (info or "null")
return None, "null"