From 6d4bc38ea674de658d35242a10e95215b1a66181 Mon Sep 17 00:00:00 2001
From: vanitasvitae <vanitasvitae@fsfe.org>
Date: Fri, 14 Oct 2016 12:32:55 +0200
Subject: [PATCH] Fixed SettingsActivity crash

---
 .../diaspora_android/activity/SettingsActivity.java  | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/SettingsActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/SettingsActivity.java
index 807e6069..dd0032d7 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/activity/SettingsActivity.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/SettingsActivity.java
@@ -142,11 +142,13 @@ public class SettingsActivity extends ThemedActivity implements IntellihideToolb
         @Override
         public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
             updatePreference(findPreference(key));
-            if (key.equals(getString(R.string.pref_key__intellihide_toolbars))) {
-                if (sharedPreferences.getBoolean(getString(R.string.pref_key__intellihide_toolbars), false)) {
-                    ((SettingsActivity) getActivity()).enableToolbarHiding();
-                } else {
-                    ((SettingsActivity) getActivity()).disableToolbarHiding();
+            if(isAdded()) {
+                if (key.equals(getString(R.string.pref_key__intellihide_toolbars))) {
+                    if (sharedPreferences.getBoolean(getString(R.string.pref_key__intellihide_toolbars), false)) {
+                        ((SettingsActivity) getActivity()).enableToolbarHiding();
+                    } else {
+                        ((SettingsActivity) getActivity()).disableToolbarHiding();
+                    }
                 }
             }
         }