Fix bug caused by 8b1aef2

Chris Banes · Chris Banes · commit e10106bfdbc5 · 2012-12-29T16:49:58.000Z
diff --git a/library/src/com/handmark/pulltorefresh/library/PullToRefreshAdapterViewBase.java b/library/src/com/handmark/pulltorefresh/library/PullToRefreshAdapterViewBase.java
@@ -191,7 +191,12 @@ public final void setEmptyView(View newEmptyView) {
 
 			// We need to convert any LayoutParams so that it works in our
 			// FrameLayout
-			refreshableViewWrapper.addView(newEmptyView, convertEmptyViewLayoutParams(newEmptyView.getLayoutParams()));
+			FrameLayout.LayoutParams lp = convertEmptyViewLayoutParams(newEmptyView.getLayoutParams());
+			if (null != lp) {
+				refreshableViewWrapper.addView(newEmptyView, lp);
+			} else {
+				refreshableViewWrapper.addView(newEmptyView);
+			}
 		}
 
 		if (mRefreshableView instanceof EmptyViewMethodAccessor) {
