don't store icon as global; re-load instead

DietmarSchwertberger · DietmarSchwertberger · commit 01a83de610b5 · 2018-04-26T20:27:16.000+02:00
diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py
@@ -1349,24 +1349,18 @@ def _load_bitmap(filename):
     return bmp
 
 
-_FRAME_ICON = None
-
-
 def _set_frame_icon(frame):
     # set frame icon
-    global _FRAME_ICON
-    if not _FRAME_ICON:
-        _FRAME_ICON = bundle = wx.IconBundle()
-        for image in ('matplotlib.png', 'matplotlib_large.png'):
-            image = os.path.join(matplotlib.rcParams['datapath'], 'images',
-                                 image)
-            if not os.path.exists(image):
-                continue
-            icon = wx.Icon(_load_bitmap(image))
-            if not icon.IsOk():
-                return
-            bundle.AddIcon(icon)
-    frame.SetIcons(_FRAME_ICON)
+    bundle = wx.IconBundle()
+    for image in ('matplotlib.png', 'matplotlib_large.png'):
+        image = os.path.join(matplotlib.rcParams['datapath'], 'images', image)
+        if not os.path.exists(image):
+            continue
+        icon = wx.Icon(_load_bitmap(image))
+        if not icon.IsOk():
+            return
+        bundle.AddIcon(icon)
+    frame.SetIcons(bundle)
 
 
 class MenuButtonWx(wx.Button):
