From 3d3d5b9b96437733954a13ad7166377b9e966a39 Mon Sep 17 00:00:00 2001
From: Alinson Xavier <axavier@uwaterloo.ca>
Date: Wed, 15 Jun 2016 05:02:13 -0400
Subject: [PATCH] Fix top navigation on Settings and About screens

---
 app/src/main/java/org/isoron/uhabits/ui/BaseActivity.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/isoron/uhabits/ui/BaseActivity.java b/app/src/main/java/org/isoron/uhabits/ui/BaseActivity.java
index 84e66d61e..b8b3eb55c 100644
--- a/app/src/main/java/org/isoron/uhabits/ui/BaseActivity.java
+++ b/app/src/main/java/org/isoron/uhabits/ui/BaseActivity.java
@@ -54,8 +54,8 @@ abstract public class BaseActivity extends AppCompatActivity
     @Override
     public boolean onCreateOptionsMenu(@Nullable Menu menu)
     {
-        if (menu == null) return false;
-        if (baseMenu == null) return false;
+        if (menu == null) return true;
+        if (baseMenu == null) return true;
         baseMenu.onCreate(getMenuInflater(), menu);
         return true;
     }