Merge pull request #1658 from kiwix/feature/macgills/1656-npe-core-main

Feature/macgills/1656 npe core main
This commit is contained in:
Seán Mac Gillicuddy 2019-12-18 09:47:19 +00:00 committed by GitHub
commit 1edba72742
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -504,7 +504,9 @@ public abstract class CoreMainActivity extends BaseActivity
tabSwitcherRoot.setVisibility(View.GONE); tabSwitcherRoot.setVisibility(View.GONE);
progressBar.setVisibility(View.VISIBLE); progressBar.setVisibility(View.VISIBLE);
contentFrame.setVisibility(View.VISIBLE); contentFrame.setVisibility(View.VISIBLE);
mainMenu.showWebViewOptions(!urlIsInvalid()); if (mainMenu != null) {
mainMenu.showWebViewOptions(!urlIsInvalid());
}
} }
} }