Fixed Phone: Pressing a filter-item sometimes crashes with NPE

astrid/src/com/todoroo/astrid/activity/FilterListWrapperActivity.java

@@ -17,14 +17,23 @@ public class FilterListWrapperActivity extends AstridWrapperActivity {
         ThemeService.applyTheme(this);
 		super.onCreate(savedInstanceState);
         setContentView(R.layout.filter_list_wrapper_activity);
+	}
+
+    /* (non-Javadoc)
+     * @see android.support.v4.app.FragmentActivity#onResume()
+     */
+    @Override
+    protected void onResume() {
+        super.onResume();
 
         Fragment frag = (Fragment) getSupportFragmentManager()
                 .findFragmentById(R.id.tasklist_fragment);
-        if (frag != null)
-        {
+        if (frag != null && frag.isInLayout()) {
             mMultipleFragments = true;
+        } else {
+            mMultipleFragments = false;
         }
-	}
+    }
 
     @Override
     public void setTitle(CharSequence title) {

astrid/src/com/todoroo/astrid/activity/TaskEditWrapperActivity.java

@@ -16,14 +16,23 @@ public class TaskEditWrapperActivity extends AstridWrapperActivity {
         ThemeService.applyTheme(this);
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.task_edit_wrapper_activity);
+	}
+
+    /* (non-Javadoc)
+     * @see android.support.v4.app.FragmentActivity#onResume()
+     */
+    @Override
+    protected void onResume() {
+        super.onResume();
 
         Fragment frag = (Fragment) getSupportFragmentManager()
-                .findFragmentById(R.id.taskedit_fragment);
-        if (frag != null)
-        {
+                .findFragmentById(R.id.tasklist_fragment);
+        if (frag != null) {
             mMultipleFragments = true;
+        } else {
+            mMultipleFragments = false;
         }
-	}
+    }
 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {

astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java

@@ -16,14 +16,23 @@ public class TaskListWrapperActivity extends AstridWrapperActivity {
         ThemeService.applyTheme(this);
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.task_list_wrapper_activity);
+	}
+
+    /* (non-Javadoc)
+     * @see android.support.v4.app.FragmentActivity#onResume()
+     */
+    @Override
+    protected void onResume() {
+        super.onResume();
 
         Fragment frag = (Fragment) getSupportFragmentManager()
                 .findFragmentById(R.id.filterlist_fragment);
-        if (frag != null && frag.isInLayout())
-        {
+        if (frag != null && frag.isInLayout()) {
             mMultipleFragments = true;
+        } else {
+            mMultipleFragments = false;
         }
-	}
+    }
 
     @Override
     public void setTitle(CharSequence title) {