Merge remote-tracking branch 'origin/master' into attrGroup

# Conflicts: # eve.db
2018-10-13 00:02:06 -04:00
parent c27032ef64 20fbda9e7a
commit d2b601dd8f
93 changed files with 76 additions and 43 deletions
--- a/gui/bitmap_loader.py
+++ b/gui/bitmap_loader.py
@@ -73,7 +73,11 @@ class BitmapLoader(object):

    @classmethod
    def getImage(cls, name, location):
-        return cls.getBitmap(name, location).ConvertToImage()
+        bmp = cls.getBitmap(name, location)
+        if bmp is not None:
+            return bmp.ConvertToImage()
+        else:
+            return None

    @classmethod
    def loadBitmap(cls, name, location):