From d72f21d47bce461e81f59599e7218f0acbbb9e33 Mon Sep 17 00:00:00 2001
From: Adrian Sampson <adrian@radbox.org>
Date: Fri, 24 Jan 2014 20:33:41 -0800
Subject: [PATCH] catch OSError when checking for `convert` program

As reported by zeltak on IRC.
---
 beets/util/artresizer.py | 2 +-
 docs/changelog.rst       | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/beets/util/artresizer.py b/beets/util/artresizer.py
index 25c5e42dd..a4b2f62de 100644
--- a/beets/util/artresizer.py
+++ b/beets/util/artresizer.py
@@ -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.
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 0f8897a43..7240ba6ff 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -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)