From b9997cbb5abab2f7fda35ae641d69c8e2b74cd92 Mon Sep 17 00:00:00 2001
From: Johan von Forstner <johan.forstner@gmail.com>
Date: Sat, 13 Jun 2020 23:06:45 +0200
Subject: [PATCH] fix exiting with back button

---
 app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt b/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt
index 0abc0851..6ae90b9f 100644
--- a/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt
@@ -347,11 +347,14 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         vm.mapTrafficEnabled.observe(viewLifecycleOwner, Observer {
             map?.isTrafficEnabled = it
         })
+
+        updateBackPressedCallback()
     }
 
     private fun updateBackPressedCallback() {
         backPressedCallback.isEnabled =
-            vm.bottomSheetState.value != STATE_HIDDEN || vm.searchResult.value != null
+            vm.bottomSheetState.value != null && vm.bottomSheetState.value != STATE_HIDDEN
+                    || vm.searchResult.value != null
                     || (vm.layersMenuOpen.value ?: false)
     }