aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAidan Follestad <drummer.aidan@gmail.com>2016-02-03 18:22:54 -0600
committerAidan Follestad <drummer.aidan@gmail.com>2016-02-03 18:22:54 -0600
commit6546e6c13e74517114b6046ae8490a56f0af834f (patch)
treeda5332c9821d1a5819806773aace257da0a5405e
parent68c68969f2bfc926cc08ce64f2fe647e83563462 (diff)
downloadafollestad-6546e6c13e74517114b6046ae8490a56f0af834f.tar.gz
Resolves #934
-rw-r--r--commons/src/main/java/com/afollestad/materialdialogs/color/ColorChooserDialog.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/commons/src/main/java/com/afollestad/materialdialogs/color/ColorChooserDialog.java b/commons/src/main/java/com/afollestad/materialdialogs/color/ColorChooserDialog.java
index 2cb2cde..5816787 100644
--- a/commons/src/main/java/com/afollestad/materialdialogs/color/ColorChooserDialog.java
+++ b/commons/src/main/java/com/afollestad/materialdialogs/color/ColorChooserDialog.java
@@ -106,7 +106,8 @@ public class ColorChooserDialog extends DialogFragment implements View.OnClickLi
outState.putInt("top_index", topIndex());
outState.putBoolean("in_sub", isInSub());
outState.putInt("sub_index", subIndex());
- outState.putBoolean("in_custom", mColorChooserCustomFrame.getVisibility() == View.VISIBLE);
+ outState.putBoolean("in_custom", mColorChooserCustomFrame != null &&
+ mColorChooserCustomFrame.getVisibility() == View.VISIBLE);
}
@Override