Further fixes for PR etsy#85 - bugs in setAdapter

denizmveli · denizmveli · commit 2fce475c197b · 2014-04-06T13:09:55.000-04:00
diff --git a/library/src/main/java/com/etsy/android/grid/ExtendableListView.java b/library/src/main/java/com/etsy/android/grid/ExtendableListView.java
@@ -267,9 +267,9 @@ public void setAdapter(final ListAdapter adapter) {
         mDataChanged = true;
         mItemCount = mAdapter != null ? mAdapter.getCount() : 0;
 
-        if (adapter != null) {
-            adapter.registerDataSetObserver(mObserver);
-            mRecycleBin.setViewTypeCount(adapter.getViewTypeCount());
+        if (mAdapter != null) {
+            mAdapter.registerDataSetObserver(mObserver);
+            mRecycleBin.setViewTypeCount(mAdapter.getViewTypeCount());
         }
 
         requestLayout();
