Merge branch 'master' into efs_port

2018-07-17 03:06:34 -04:00
parent b1f1db1bee df75646766
commit fe43c2ee2e
3 changed files with 7 additions and 3 deletions
--- a/gui/bitmap_loader.py
+++ b/gui/bitmap_loader.py
@@ -49,7 +49,7 @@ class BitmapLoader(object):
    @classmethod
    def getStaticBitmap(cls, name, parent, location):
        static = wx.StaticBitmap(parent)
-        static.SetBitmap(cls.getBitmap(name, location))
+        static.SetBitmap(cls.getBitmap(name or 0, location))
        return static

    @classmethod