Merge branch 'devel' of github.com:ZeroPhone/ZPUI into devel

ZeroPhone · Nov 28, 2018 · 6a74d74 · 6a74d74
2 parents 4e54c40 + 38ee540
commit 6a74d74
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/splash.py b/splash.py
@@ -4,7 +4,7 @@ def splash(i, o):
     if (o.width, o.height) == (128, 64):
 	image = Image.open("splash.png").convert('L')
 	image = ImageOps.invert(image)
-    else:
+    elif o.width >= 128 and o.height >= 64:
 	image = Image.open("splash_big.png").convert('L')
 	image = ImageOps.invert(image)
 	size = o.width, o.height
@@ -20,6 +20,9 @@ def splash(i, o):
 	    top = delta // 2
 	    bottom = delta - top
         image = ImageOps.expand(image, border=(left, top, right, bottom), fill="black")
+    else:
+	o.display_data("Welcome to", "ZPUI")
+	return 
     image = image.convert(o.device_mode)
     o.display_image(image)