ThemeManager: fix crash when no theme is set

MCMrARM · Feb 22, 2019 · 42e8ca9 · 42e8ca9
1 parent f99735a
commit 42e8ca9
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/app/src/main/java/io/mrarm/irc/util/theme/ThemeManager.java b/app/src/main/java/io/mrarm/irc/util/theme/ThemeManager.java
@@ -263,8 +263,9 @@ public void applyThemeToActivity(Activity activity) {
                     currentCustomThemePatcher.getAssetManager() : context.getAssets(),
                     new DisplayMetrics(), c);
             Resources.Theme t = r.newTheme();
-            t.applyStyle(currentTheme.getThemeResId(), true);
-            IRCColorUtils.loadColors(t, currentTheme.getIRCColorsResId());
+            ThemeResInfo resInfo = currentTheme != null ? currentTheme : fallbackTheme;
+            t.applyStyle(resInfo.getThemeResId(), true);
+            IRCColorUtils.loadColors(t, resInfo.getIRCColorsResId());
             mNeedsApplyIrcColors = false;
         }
         if (currentCustomThemePatcher != null) {