am 3e391663: am 17bd2d15: fix race condition in photo dreams settings activity
* commit '3e391663b58df16a516259a4cae2464a50d667dc':
fix race condition in photo dreams settings activity
diff --git a/src/com/android/dreams/phototable/FlipperDreamSettings.java b/src/com/android/dreams/phototable/FlipperDreamSettings.java
index 464029e..cd24721 100644
--- a/src/com/android/dreams/phototable/FlipperDreamSettings.java
+++ b/src/com/android/dreams/phototable/FlipperDreamSettings.java
@@ -108,7 +108,9 @@
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.photodream_menu_all:
- mAdapter.selectAll(!mAdapter.areAllSelected());
+ if (mAdapter != null) {
+ mAdapter.selectAll(!mAdapter.areAllSelected());
+ }
return true;
default:
return super.onOptionsItemSelected(item);