Merge branch 'upcoming' of https://github.com/ciderapp/Cider into upcoming

2022-01-21 20:20:25 -08:00 · 2022-01-21 20:20:25 -08:00 · ffddf55cb2
commit ffddf55cb2
parent 354fc82cf4 0323a9f451
4 changed files with 11 additions and 4 deletions
--- a/src/renderer/index.js
+++ b/src/renderer/index.js
@ -234,6 +234,7 @@ const app = new Vue({
            loadingState: 0, // 0 loading, 1 loaded, 2 error
            id: ""
        },
+        webremoteurl : "",
        webremoteqr: "",
        mxmtoken: "",
        mkIsReady: false,
@ -3308,6 +3309,7 @@ const app = new Vue({
        },
        async showWebRemoteQR(){
           this.webremoteqr = await ipcRenderer.invoke('setRemoteQR','')
+           this.webremoteurl =  await ipcRenderer.invoke('setRemoteURL','')
           this.modals.qrcode = true;
        }