Bugfixes

gurrhack · Feb 23, 2015 · 9130c8b · 9130c8b
1 parent 72cce60
commit 9130c8b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/sys/android/AndroidManifest.xml b/sys/android/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.tbd.NetHack"
-	android:versionCode="137"
-	android:versionName="1.3.7"
+	android:versionCode="138"
+	android:versionName="1.3.8"
 	android:installLocation="auto">
 	<uses-sdk
 		android:minSdkVersion="7"/>

diff --git a/sys/android/src/com/tbd/NetHack/NHW_Message.java b/sys/android/src/com/tbd/NetHack/NHW_Message.java
@@ -328,6 +328,8 @@ public void run()
 					for(int i = 0; i < mDispCount && i < 3; i++)
 					{
 						LogEntry e = mLog[getIndex(iStart + i)];
+						if(e.msg == null)
+							break;
 						if(i > 0)
 							m_view.append("\n");
 						if(e.repeat > 1)

diff --git a/sys/android/src/com/tbd/NetHack/TilesetPreference.java b/sys/android/src/com/tbd/NetHack/TilesetPreference.java
@@ -254,14 +254,7 @@ private void persistTileset(String id, int tileW, int tileH, boolean custom)
 			}
 			if(shouldCommit())
 			{
-				try
-				{
-					editor.apply();
-				}
-				catch(AbstractMethodError unused)
-				{
-					editor.commit();
-				}
+				editor.commit();
 			}
 		}
 	}