From fc1a907af0d7f20fae3abb0ab4ed0916a7fd5aee Mon Sep 17 00:00:00 2001
From: Hannes Janetzek <hannes.janetzek@gmail.com>
Date: Sun, 6 Oct 2013 20:45:07 +0200
Subject: [PATCH] fix: no NPE when theme is invalid

---
 vtm/src/org/oscim/map/Map.java           | 2 +-
 vtm/src/org/oscim/theme/ThemeLoader.java | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/vtm/src/org/oscim/map/Map.java b/vtm/src/org/oscim/map/Map.java
index add77573..08af7227 100644
--- a/vtm/src/org/oscim/map/Map.java
+++ b/vtm/src/org/oscim/map/Map.java
@@ -109,7 +109,7 @@ public abstract class Map implements EventDispatcher {
 		IRenderTheme t = ThemeLoader.load(theme);
 		if (t == null) {
 			Log.e(TAG, "Invalid theme");
-			throw new IllegalStateException();
+			return;
 		}
 
 		mCurrentTheme = theme;
diff --git a/vtm/src/org/oscim/theme/ThemeLoader.java b/vtm/src/org/oscim/theme/ThemeLoader.java
index bc6f0fc9..db5d6ea0 100644
--- a/vtm/src/org/oscim/theme/ThemeLoader.java
+++ b/vtm/src/org/oscim/theme/ThemeLoader.java
@@ -53,7 +53,9 @@ public class ThemeLoader {
 		try {
 			inputStream = theme.getRenderThemeAsStream();
 			IRenderTheme t = RenderThemeHandler.getRenderTheme(inputStream);
-			t.scaleTextSize(CanvasAdapter.textScale + (CanvasAdapter.dpi / 240 - 1) * 0.5f);
+
+			if (t != null)
+				t.scaleTextSize(CanvasAdapter.textScale + (CanvasAdapter.dpi / 240 - 1) * 0.5f);
 
 			return t;
 		} catch (IOException e) {