1 files changed, 3 insertions, 2 deletions
diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/MainActivity.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/MainActivity.kt
index 29f5da4..4a46b27 100644
--- a/merchant-terminal/src/main/java/net/taler/merchantpos/MainActivity.kt
+++ b/merchant-terminal/src/main/java/net/taler/merchantpos/MainActivity.kt
@@ -75,8 +75,8 @@ class MainActivity : AppCompatActivity(), OnNavigationItemSelectedListener {
 
     override fun onStart() {
         super.onStart()
-        if (!model.configManager.config.isValid() && nav.currentDestination?.id != R.id.nav_settings) {
-            nav.navigate(R.id.action_global_merchantSettings)
+        if (!model.configManager.config.isValid()) {
+            if (nav.currentDestination?.id != R.id.nav_settings) nav.navigate(R.id.action_global_merchantSettings)
         } else if (model.configManager.merchantConfig == null && nav.currentDestination?.id != R.id.configFetcher) {
             nav.navigate(R.id.action_global_configFetcher)
         }
@@ -103,6 +103,7 @@ class MainActivity : AppCompatActivity(), OnNavigationItemSelectedListener {
         return true
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onBackPressed() {
         val currentDestination = nav.currentDestination?.id
         if (ui.drawerLayout.isDrawerOpen(START)) {