From 8c3e1b18bf36e22fe36efc4b4d3902a3a81ebca3 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Mon, 26 Feb 2018 15:18:17 +0100
Subject: [PATCH] fix potential crash

---
 Habitica/AndroidManifest.xml                                  | 2 +-
 .../habitrpg/android/habitica/ui/activities/MainActivity.java | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index 1fa753985..bb8ad7aa5 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.habitrpg.android.habitica"
-    android:versionCode="1971"
+    android:versionCode="1972"
     android:versionName="1.4.2"
     android:screenOrientation="portrait"
     android:installLocation="auto" >
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
index 1811f028e..ef357de27 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
@@ -588,7 +588,9 @@ public class MainActivity extends BaseActivity implements TutorialView.OnTutoria
         userRepository.close();
         tagRepository.close();
         inventoryRepository.close();
-        keyboardUtil.disable();
+        if (keyboardUtil != null) {
+            keyboardUtil.disable();
+        }
         super.onDestroy();
     }