Merge pull request #11889 from meeseeksmachine/auto-backport-of-pr-11847-on-v3.0.x

QuLogic · web-flow · commit 1f1066136ed9 · 2018-08-19T18:30:18.000-04:00
Backport PR #11847 on branch v3.0.x
diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py
@@ -735,10 +735,17 @@ def _init_from_registry(cls):
                                         0, winreg.KEY_QUERY_VALUE | flag)
                 binpath = winreg.QueryValueEx(hkey, 'BinPath')[0]
                 winreg.CloseKey(hkey)
-                binpath += r'\convert.exe'
                 break
             except Exception:
                 binpath = ''
+        if binpath:
+            for exe in ('convert.exe', 'magick.exe'):
+                path = os.path.join(binpath, exe)
+                if os.path.exists(path):
+                    binpath = path
+                    break
+            else:
+                binpath = ''
         rcParams[cls.exec_key] = rcParamsDefault[cls.exec_key] = binpath
 
     @classmethod
