Merge pull request #1768 from pyfa-org/issue/1767

Check to make sure the bitmap exists before converting to image.
2018-10-12 23:59:22 -04:00
parent 677a9b33c5 15bbf69fcf
commit 20fbda9e7a
1 changed files with 5 additions and 1 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):