From fbdacef932eaa74ee41249b6479d95d74b3ff988 Mon Sep 17 00:00:00 2001
From: Stefan Dej <meteyou@gmail.com>
Date: Wed, 24 Feb 2021 22:41:08 +0100
Subject: [PATCH] cleanup adaptive mjpeg-streamer functions

Signed-off-by: Stefan Dej <meteyou@gmail.com>
---
 src/components/panels/WebcamPanel.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/panels/WebcamPanel.vue b/src/components/panels/WebcamPanel.vue
index f28fc6c7..1d27d311 100644
--- a/src/components/panels/WebcamPanel.vue
+++ b/src/components/panels/WebcamPanel.vue
@@ -15,7 +15,7 @@
             </v-toolbar-title>
         </v-toolbar>
         <v-card-text class="px-0 py-0 content">
-            <img :src="url" class="webcamImage" :style="webcamStyle" @load="onLoad"  alt="Webcam"/>
+            <img :src="url" class="webcamImage" :style="webcamStyle" @load="onLoad"  alt="Webcam" v-if="['mjpegstreamer', 'mjpegstreamer-adaptive'].includes(this.webcamConfig.service)" />
         </v-card-text>
     </v-card>
 </template>
@@ -58,15 +58,15 @@
             }),
 
             url() {
-                if(this.webcamConfig.service === 'mjpegstreamer-adaptive') {
-                    return this.imageData;
-                } else {
+                if (this.webcamConfig.service === 'mjpegstreamer' && this.webcamConfig.url.indexOf("?") !== -1) {
                     let basicUrl = this.webcamConfig.url
-                    if (basicUrl && basicUrl.indexOf("?") === -1) basicUrl += "?"
-
                     const params = new URLSearchParams(basicUrl)
                     params.set('bypassCache', ""+this.refresh)
                     return decodeURIComponent(params.toString())
+                } else if (this.webcamConfig.service === 'mjpegstreamer-adaptive') {
+                    return this.imageData
+                } else {
+                    return this.webcamConfig.url
                 }
             },