Prevent using the clipboard when it's disabled

Xpra-org · Dec 27, 2021 · 4f0fd25 · 4f0fd25
1 parent 96b94ea
commit 4f0fd25
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/html5/index.html b/html5/index.html
@@ -1366,6 +1366,8 @@ <h2>Xpra Bug Report</h2>
 				// disable right click menu:
 				window.oncontextmenu = function(e) {
 					client._poll_clipboard(e);
+					e.preventDefault();
+					e.stopPropagation();
 					return false;
 				}
 			}

diff --git a/html5/js/Client.js b/html5/js/Client.js
@@ -1578,6 +1578,9 @@ XpraClient.prototype.do_window_mouse_scroll = function(e, window) {
 
 
 XpraClient.prototype._poll_clipboard = function(e) {
+	if (this.clipboard_enabled === false) {
+		return;
+	}
 	//see if the clipboard contents have changed:
 	if (this.clipboard_pending) {
 		//we're still waiting to set the clipboard..
@@ -1619,6 +1622,9 @@ XpraClient.prototype._poll_clipboard = function(e) {
 };
 
 XpraClient.prototype.read_clipboard_text = function() {
+	if (this.clipboard_enabled === false) {
+		return;
+	}
 	const client = this;
 	client.debug("clipboard", "read_clipboard()");
 	//warning: this can take a while,