From bdca2962b3981090d963a2dcecb6a2ae2f5b2511 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20D=C3=B6ring?= <simon.doering@stud.hs-bochum.de>
Date: Tue, 5 Jan 2021 14:46:51 +0100
Subject: [PATCH] Fix bug that occured when wrong pin was provided
---
novnc/app/camera-receiver.js | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/novnc/app/camera-receiver.js b/novnc/app/camera-receiver.js
index 12d253b..679f905 100644
--- a/novnc/app/camera-receiver.js
+++ b/novnc/app/camera-receiver.js
@@ -9,8 +9,6 @@ document.addEventListener('DOMContentLoaded', function() {
var room = 1000;
var source = {};
- var passwordSubmitClicked = false;
-
var passwordButton = document.getElementById('noVNC_password_button');
var passwordInput = document.getElementById('noVNC_password_input');
var currentPassword = '';
@@ -24,7 +22,6 @@ document.addEventListener('DOMContentLoaded', function() {
passwordButton.onclick = function() {
pin = currentPassword;
- passwordSubmitClicked = true;
};
parseRoomFromURL();
@@ -63,8 +60,8 @@ document.addEventListener('DOMContentLoaded', function() {
// Video element and vnc canvas must be mounted
if (
janusInitialised &&
- passwordSubmitClicked &&
- document.querySelector('canvas') != null
+ document.querySelector('canvas') != null &&
+ document.documentElement.classList.contains('noVNC_connected')
) {
clearInterval(socketMountCheckInterval);
// Should only be triggered once, but the connect event
@@ -229,7 +226,6 @@ document.addEventListener('DOMContentLoaded', function() {
if (passwordParam != null) {
pin = passwordParam;
console.log('pin = ' + pin);
- passwordSubmitClicked = true;
}
}
--
GitLab