pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Fixed possible NullPointException mSearchController

Browse source 
nSearchController.hide() could throw a NullPointerException. Furthermore, the check later would then be redundant and should be moved earlier.
This commit is contained in:
demasterr 2019-03-09 17:42:36 +01:00 • committed by Aleksandr Zatsepin
parent f52796e411
commit 175b4a0a6b
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
android/src/com/mapswithme/maps/MwmActivity.java
View file

@ -1264,13 +1264,12 @@ public class MwmActivity extends BaseMwmFragmentActivity
return;
}
if (mSearchController.hide())
if (mSearchController != null && mSearchController.hide())
{
SearchEngine.INSTANCE.cancelInteractiveSearch();
if (mFilterController != null)
mFilterController.resetFilter();
if (mSearchController != null)
mSearchController.clear();
mSearchController.clear();
return;
}