From 110db5ddc37f6a20d11691db5a250ab798b7ef0e Mon Sep 17 00:00:00 2001
From: Felipe Santos <felipecassiors@gmail.com>
Date: Sun, 15 May 2022 15:31:24 -0300
Subject: [PATCH] Always switch non-Frigate cameras to live view

---
 src/card.ts | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/card.ts b/src/card.ts
index 59aaa443..a17c889a 100644
--- a/src/card.ts
+++ b/src/card.ts
@@ -5,7 +5,7 @@ import {
   LitElement,
   PropertyValues,
   TemplateResult,
-  unsafeCSS
+  unsafeCSS,
 } from 'lit';
 import { customElement, property, state } from 'lit/decorators.js';
 import { classMap } from 'lit/directives/class-map.js';
@@ -20,7 +20,7 @@ import {
   ConditionState,
   conditionStateRequestHandler,
   getOverriddenConfig,
-  getOverridesByKey
+  getOverridesByKey,
 } from './card-condition.js';
 import './components/elements.js';
 import { FrigateCardElements } from './components/elements.js';
@@ -40,7 +40,7 @@ import {
   CAMERA_BIRDSEYE,
   CARD_VERSION,
   MEDIA_PLAYER_SUPPORT_BROWSE_MEDIA,
-  REPO_URL
+  REPO_URL,
 } from './const.js';
 import './editor.js';
 import { localize } from './localize/localize.js';
@@ -54,7 +54,7 @@ import type {
   FrigateCardConfig,
   MediaShowInfo,
   MenuButton,
-  Message
+  Message,
 } from './types.js';
 import {
   Actions,
@@ -65,14 +65,14 @@ import {
   FrigateCardCustomAction,
   FrigateCardView,
   FRIGATE_CARD_VIEWS_USER_SPECIFIED,
-  RawFrigateCardConfig
+  RawFrigateCardConfig,
 } from './types.js';
 import {
   convertActionToFrigateCardCustomAction,
   createFrigateCardCustomAction,
   frigateCardHandleAction,
   frigateCardHasAction,
-  getActionConfigGivenAction
+  getActionConfigGivenAction,
 } from './utils/action.js';
 import { contentsChanged } from './utils/basic.js';
 import { getCameraIcon, getCameraID, getCameraTitle } from './utils/camera.js';
@@ -82,7 +82,7 @@ import {
   homeAssistantSignPath,
   homeAssistantWSRequest,
   shouldUpdateBasedOnHass,
-  sideLoadHomeAssistantElements
+  sideLoadHomeAssistantElements,
 } from './utils/ha';
 import { getEventID } from './utils/ha/browse-media.js';
 import { supportsFeature } from './utils/ha/update.js';
@@ -1081,7 +1081,10 @@ export class FrigateCard extends LitElement {
             view: new View({
               view:
                 this._getConfig().view.camera_select === 'current'
-                  ? this._view.view
+                  ? // Always go to live view when switching to a non-Frigate camera
+                    this._cameras?.get(camera)?.camera_name
+                    ? this._view.view
+                    : 'live'
                   : (this._getConfig().view.camera_select as FrigateCardView),
               camera: camera,
             }),