Merge pull request #2089 from kiwix/macgills/feature/2079-npe-main-menu

#2079 Crash Report 3.3.1: NPE MainMenu.isInTabSwitcher
This commit is contained in:
Kelson 2020-05-15 15:19:46 +02:00 committed by GitHub
commit 52b88ec43a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1450,7 +1450,7 @@ public abstract class CoreMainActivity extends BaseActivity
switch (requestCode) {
case MainMenuKt.REQUEST_FILE_SEARCH:
if (resultCode == RESULT_OK) {
boolean wasFromTabSwitcher = mainMenu.isInTabSwitcher();
boolean wasFromTabSwitcher = mainMenu != null && mainMenu.isInTabSwitcher();
hideTabSwitcher();
String title =
data.getStringExtra(TAG_FILE_SEARCHED).replace("<b>", "").replace("</b>", "");