Fixed NPE when overriding font size of non-ttf font with inline style.

codenameone · Sep 21, 2017 · 863092a · 863092a
1 parent e150ae7
commit 863092a
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/CodenameOne/src/com/codename1/ui/plaf/StyleParser.java b/CodenameOne/src/com/codename1/ui/plaf/StyleParser.java
@@ -2180,11 +2180,18 @@ public void setFile(String file) {
          */
         public Font createFont(Style baseStyle) {
             Font f = name == null ? baseStyle.getFont() : Font.createTrueTypeFont(name, file);
-            if (f == null) {
+            if (f == null || (getSize() != null && !f.isTTFNativeFont())) {
                 f = Font.createTrueTypeFont(Font.NATIVE_MAIN_REGULAR, Font.NATIVE_MAIN_REGULAR);
-
             }
-            return f.derive(getSizeInPixels(baseStyle), f.getStyle());
+            if (f != null) {
+                if (f.isTTFNativeFont()) {
+                    return f.derive(getSizeInPixels(baseStyle), f.getStyle());
+                } else {
+                    return Font.getDefaultFont();
+                }
+            } else {
+                return Font.getDefaultFont();
+            }
         }
     }