catch OSError when checking for convert program

As reported by zeltak on IRC.
This commit is contained in:
Adrian Sampson 2014-01-24 20:33:41 -08:00
parent def635a33b
commit d72f21d47b
2 changed files with 4 additions and 1 deletions

View file

@ -192,7 +192,7 @@ class ArtResizer(object):
out = subprocess.check_output(['convert', '--version']).lower()
if 'imagemagick' in out:
return IMAGEMAGICK
except subprocess.CalledProcessError:
except (subprocess.CalledProcessError, OSError):
pass # system32/convert.exe may be interfering
# Fall back to Web proxy method.

View file

@ -36,6 +36,9 @@ Other little fixes:
* :doc:`/plugins/web`: The ``/item/`` and ``/album/`` API endpoints now
produce full details about albums and items, not just lists of IDs. Thanks
to geigerzaehler.
* Fix a potential crash when using image resizing with the
:doc:`/plugins/fetchart` or :doc:`/plugins/embedart` without ImageMagick
installed.
1.3.2 (December 22, 2013)