From 349aabe12c7449b1404279f8953c545b55d41f4d Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov@thingsboard.io>
Date: Mon, 5 Sep 2022 13:59:59 +0300
Subject: [PATCH] Navigation improvements

---
 lib/modules/main/main_page.dart | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/modules/main/main_page.dart b/lib/modules/main/main_page.dart
index f2761dd..25d7e63 100644
--- a/lib/modules/main/main_page.dart
+++ b/lib/modules/main/main_page.dart
@@ -153,6 +153,9 @@ class _MainPageState extends TbPageState<MainPage>
     TbMainNavigationItem.changeItemsTitleIntl(_tabItems, context);
     return WillPopScope(
         onWillPop: () async {
+          if (!await tbContext.willPop()) {
+            return false;
+          }
           if (_tabController.index > 0) {
             _setIndex(0);
             return false;