Fixed NPE while resuming fragment

arcao · Apr 25, 2013 · 91ab690 · 91ab690
1 parent 6080aa8
commit 91ab690
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/com/arcao/geocaching4locus/fragment/AbstractDialogFragment.java b/src/com/arcao/geocaching4locus/fragment/AbstractDialogFragment.java
@@ -2,6 +2,7 @@
 
 import java.lang.ref.WeakReference;
 
+import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
 
 public abstract class AbstractDialogFragment extends DialogFragment {
@@ -23,6 +24,9 @@ public void onDestroyView() {
 	public void dismiss() {
 		// this fix IllegalStateException when App is hidden
 		if (!isAdded() || getFragmentManager() == null) {
+			if (getArguments() == null)
+				setArguments(new Bundle());
+
 			getArguments().putBoolean(PARAM_DISMISS_LATER, true);
 		}
 
@@ -37,7 +41,7 @@ public void dismiss() {
 	public void onResume() {
 		super.onResume();
 
-		if (getArguments().getBoolean(PARAM_DISMISS_LATER, false)) {
+		if (getArguments() != null && getArguments().getBoolean(PARAM_DISMISS_LATER, false)) {
 			dismiss();
 		}
 	}