From 3041eb5ce0f4175fb27bf245cda91188f7cb6c61 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Thu, 25 Jun 2020 17:03:07 -0700
Subject: [PATCH] Fix suspend logic (#6237)

---
 package.json                                              | 2 +-
 src/panels/lovelace/components/hui-image.ts               | 7 ++-----
 .../config-elements/hui-picture-entity-card-editor.ts     | 2 +-
 yarn.lock                                                 | 8 ++++----
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 7fc5052144..66c8aa500d 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,7 @@
     "fuse.js": "^6.0.0",
     "google-timezones-json": "^1.0.2",
     "hls.js": "^0.12.4",
-    "home-assistant-js-websocket": "^5.3.0",
+    "home-assistant-js-websocket": "^5.4.0",
     "idb-keyval": "^3.2.0",
     "intl-messageformat": "^8.3.9",
     "js-yaml": "^3.13.1",
diff --git a/src/panels/lovelace/components/hui-image.ts b/src/panels/lovelace/components/hui-image.ts
index 4dbbfeac10..cdfc7bfb2f 100644
--- a/src/panels/lovelace/components/hui-image.ts
+++ b/src/panels/lovelace/components/hui-image.ts
@@ -54,11 +54,8 @@ export class HuiImage extends LitElement {
 
   private _cameraUpdater?: number;
 
-  private _attached?: boolean;
-
   public connectedCallback(): void {
     super.connectedCallback();
-    this._attached = true;
     if (this.cameraImage && this.cameraView !== "live") {
       this._startUpdateCameraInterval();
     }
@@ -66,7 +63,6 @@ export class HuiImage extends LitElement {
 
   public disconnectedCallback(): void {
     super.disconnectedCallback();
-    this._attached = false;
     this._stopUpdateCameraInterval();
   }
 
@@ -170,7 +166,7 @@ export class HuiImage extends LitElement {
 
   private _startUpdateCameraInterval(): void {
     this._stopUpdateCameraInterval();
-    if (this.cameraImage && this._attached) {
+    if (this.cameraImage && this.isConnected) {
       this._cameraUpdater = window.setInterval(
         () => this._updateCameraImageSrc(),
         UPDATE_INTERVAL
@@ -181,6 +177,7 @@ export class HuiImage extends LitElement {
   private _stopUpdateCameraInterval(): void {
     if (this._cameraUpdater) {
       clearInterval(this._cameraUpdater);
+      this._cameraUpdater = undefined;
     }
   }
 
diff --git a/src/panels/lovelace/editor/config-elements/hui-picture-entity-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-picture-entity-card-editor.ts
index fc8e2587bc..efd1e2b831 100644
--- a/src/panels/lovelace/editor/config-elements/hui-picture-entity-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-picture-entity-card-editor.ts
@@ -77,7 +77,7 @@ export class HuiPictureEntityCardEditor extends LitElement
   }
 
   get _aspect_ratio(): string {
-    return this._config!.aspect_ratio || "50";
+    return this._config!.aspect_ratio || "";
   }
 
   get _tap_action(): ActionConfig {
diff --git a/yarn.lock b/yarn.lock
index d4f02c9517..9882f3ec8f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6683,10 +6683,10 @@ hmac-drbg@^1.0.0:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.1"
 
-home-assistant-js-websocket@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/home-assistant-js-websocket/-/home-assistant-js-websocket-5.3.0.tgz#261d371c72746ec8b0eb8768b286d4f865e408b7"
-  integrity sha512-treEjeKpHB7JNrLddOf4FJudcm7hf9y23bNv/9GKiOvmmWIbblKt7UN+2V0WjPmBkSRvLmGprA/xxh5cgS8S1g==
+home-assistant-js-websocket@^5.4.0:
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/home-assistant-js-websocket/-/home-assistant-js-websocket-5.4.0.tgz#637321ba47138562716290404adfa921d8d525dc"
+  integrity sha512-/sMJZwKTkoDvCljBTwGRiZy67ODZua/xYNH61n4zmX3Lcgb1D/zRDiJtwvW+g//BO/RAsNR5GulbUOdDrqmQlA==
 
 homedir-polyfill@^1.0.1:
   version "1.0.3"