Merge remote-tracking branch 'u/nightly' into feat-combine

qiin2333 · Mar 5, 2024 · da8f97d · da8f97d
1 parent 068b388
commit da8f97d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/docker/archlinux.dockerfile b/docker/archlinux.dockerfile
@@ -87,6 +87,7 @@ RUN <<_PKGBUILD
 set -e
 namcap -i PKGBUILD
 makepkg -si --noconfirm
+rm -f /build/sunshine/pkg/sunshine-debug*.pkg.tar.zst
 ls -a
 _PKGBUILD
 

diff --git a/src_assets/common/assets/web/pin.html b/src_assets/common/assets/web/pin.html
@@ -127,6 +127,8 @@ <h2 id="unpair" class="text-center me-auto">Unpair Clients</h2>
           this.config = r
         })
       this.refreshClients();
+    },
+    mounted() {
       this.initPinForm();
     },
     beforeDestroy() { },
@@ -172,11 +174,11 @@ <h2 id="unpair" class="text-center me-auto">Unpair Clients</h2>
         });
       },
       serialize(listArray = []) {
-        let nl = this.config.platform === "windows" ? "\r\n" : "\n";
+        let nl = "\n";
         return "[" +
           nl +
           "    " +
-          listArray.join("," + nl + "    ") +
+          listArray.map(item => JSON.stringify(item)).join("," + nl + "    ") +
           nl +
           "]";
       },