From 31a13a02c2ba04a32a04c2c027da0e3530bf6957 Mon Sep 17 00:00:00 2001
From: Christophe Beyls <software@digitalia.be>
Date: Wed, 26 Oct 2016 14:52:06 +0200
Subject: [PATCH] Fixed rare case when trying to unregister a null observer

---
 .../java/be/digitalia/fosdem/widgets/AdapterLinearLayout.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/be/digitalia/fosdem/widgets/AdapterLinearLayout.java b/app/src/main/java/be/digitalia/fosdem/widgets/AdapterLinearLayout.java
index 7ae0c7e..ec3182b 100644
--- a/app/src/main/java/be/digitalia/fosdem/widgets/AdapterLinearLayout.java
+++ b/app/src/main/java/be/digitalia/fosdem/widgets/AdapterLinearLayout.java
@@ -82,7 +82,7 @@ public class AdapterLinearLayout extends LinearLayout {
 	@Override
 	protected void onDetachedFromWindow() {
 		super.onDetachedFromWindow();
-		if (mAdapter != null) {
+		if ((mAdapter != null) && (mDataSetObserver != null)) {
 			mAdapter.mDataSetObservable.unregisterObserver(mDataSetObserver);
 		}
 		mDataSetObserver = null;