From faff17e1f141ed144a413fcbadd581fba9ab9f11 Mon Sep 17 00:00:00 2001
From: Hocuri <hocceruser-github@gmx.de>
Date: Thu, 23 Apr 2020 20:55:48 +0200
Subject: [PATCH] Fix Null-Pointer-Exception

---
 src/org/thoughtcrime/securesms/ConversationListFragment.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/org/thoughtcrime/securesms/ConversationListFragment.java b/src/org/thoughtcrime/securesms/ConversationListFragment.java
index 9bc45de62..8b4d1841f 100644
--- a/src/org/thoughtcrime/securesms/ConversationListFragment.java
+++ b/src/org/thoughtcrime/securesms/ConversationListFragment.java
@@ -449,7 +449,10 @@ public class ConversationListFragment extends Fragment
     getListAdapter().initializeBatchMode(true);
     getListAdapter().toggleThreadInBatchSet(item.getChatId());
     getListAdapter().notifyDataSetChanged();
-    updateActionModeItems(actionMode.getMenu());
+    Menu menu = actionMode.getMenu();
+    if (menu != null) {
+        updateActionModeItems(menu);
+    }
   }
 
   @Override