From 01c0a08fa8320092cefed97fe01914ee078ff834 Mon Sep 17 00:00:00 2001
From: Yegor Vialov <vyalov.egor@gmail.com>
Date: Fri, 1 May 2020 19:02:42 +0000
Subject: [PATCH] Fix media menu closing behaviour

---
 lib/pages/main/main.page.dart | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/pages/main/main.page.dart b/lib/pages/main/main.page.dart
index 67ecc20..cdcdc7f 100644
--- a/lib/pages/main/main.page.dart
+++ b/lib/pages/main/main.page.dart
@@ -211,6 +211,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
     if (_showEntityPageSubscription == null) {
       _showEntityPageSubscription =
           eventBus.on<ShowEntityPageEvent>().listen((event) {
+            Logger.d('Showing entity page event handled: ${event.entityId}');
             _showEntityPage(event.entityId);
           });
     }
@@ -309,6 +310,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
   }
 
   void _showEntityPage(String entityId) {
+    Logger.d('Showing entity page: $entityId');
     Navigator.push(
       context,
       MaterialPageRoute(
@@ -615,7 +617,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
                       ).then((String val) {
                         if (val == "play_media") {
                           Navigator.pushNamed(context, "/play-media", arguments: {"url": ""});
-                        } else  {
+                        } else if (val != null)  {
                           _showEntityPage(val);
                         }
                       });