From 8e07d5d1a1c982d2b0e70167d03619cdd3408389 Mon Sep 17 00:00:00 2001
From: hensm <m+github@matt.tf>
Date: Mon, 27 Jan 2020 16:25:58 +0000
Subject: [PATCH] Fix receiver selector app name not displaying correctly

---
 ext/src/background/receiverSelector/NativeReceiverSelector.ts | 2 +-
 ext/src/shim/cast/index.ts                                    | 2 ++
 ext/src/ui/popup/index.tsx                                    | 3 +--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ext/src/background/receiverSelector/NativeReceiverSelector.ts b/ext/src/background/receiverSelector/NativeReceiverSelector.ts
index de0bd85..7ea7bad 100644
--- a/ext/src/background/receiverSelector/NativeReceiverSelector.ts
+++ b/ext/src/background/receiverSelector/NativeReceiverSelector.ts
@@ -105,7 +105,7 @@ export default class NativeReceiverSelector
               , i18n_castButtonTitle: _("popupCastButtonTitle")
               , i18n_stopButtonTitle: _("popupStopButtonTitle")
               , i18n_mediaTypeApp:
-                        knownApps[requestedAppId].name ?? _("popupMediaTypeApp")
+                        knownApps[requestedAppId]?.name ?? _("popupMediaTypeApp")
               , i18n_mediaTypeTab: _("popupMediaTypeTab")
               , i18n_mediaTypeScreen: _("popupMediaTypeScreen")
               , i18n_mediaTypeFile: _("popupMediaTypeFile")
diff --git a/ext/src/shim/cast/index.ts b/ext/src/shim/cast/index.ts
index b970833..a26dbe1 100755
--- a/ext/src/shim/cast/index.ts
+++ b/ext/src/shim/cast/index.ts
@@ -381,6 +381,8 @@ onMessage(async message => {
             logger.info("Stopped receiver");
 
             if (sessionRequestInProgress) {
+                sessionRequestInProgress = false;
+
                 for (const listener of receiverActionListeners) {
                     const castReceiver = new Receiver_(
                             message.data.receiver.id
diff --git a/ext/src/ui/popup/index.tsx b/ext/src/ui/popup/index.tsx
index 7bd51fc..9c91267 100755
--- a/ext/src/ui/popup/index.tsx
+++ b/ext/src/ui/popup/index.tsx
@@ -145,8 +145,7 @@ class PopupApp extends Component<{}, PopupAppState> {
                         <option value={ ReceiverSelectorMediaType.App }
                                 disabled={ !(this.state.availableMediaTypes
                                         & ReceiverSelectorMediaType.App) }>
-                            { (this.state.requestedAppId
-                                    && knownApps[this.state.requestedAppId].name)
+                            { (this.state.requestedAppId && knownApps[this.state.requestedAppId]?.name)
                                         ?? _("popupMediaTypeApp") }
                         </option>
                         <option value={ ReceiverSelectorMediaType.Tab }