Merge 9329ae6 into cb7258a

rachanabhandiwad · web-flow · commit ab248ca57a76 · 2025-04-20T15:12:46.000-04:00
diff --git a/source/_remoteClient/client.py b/source/_remoteClient/client.py
@@ -135,19 +135,17 @@ def pushClipboard(self):
 		connector = self.followerTransport or self.leaderTransport
 		if not getattr(connector, "connected", False):
 			# Translators: Message shown when trying to push the clipboard to the remote computer while not connected.
-			ui.message(_("Not connected."))
-			return
+			raise RuntimeError(_("Not connected."))
 		elif self.connectedClientsCount < 1:
 			# Translators: Reported when performing a Remote Access action, but there are no other computers in the channel.
-			ui.message(pgettext("remote", "No one else is connected"))
-			return
+			raise RuntimeError(_("No one else is connected"))
 		try:
 			connector.send(RemoteMessageType.SET_CLIPBOARD_TEXT, text=api.getClipData())
 			cues.clipboardPushed()
 		except (TypeError, OSError):
 			log.debug("Unable to push clipboard", exc_info=True)
 			# Translators: Message shown when clipboard content cannot be sent to the remote computer.
-			ui.message(_("Unable to push clipboard"))
+			raise RuntimeError(_("Unable to push clipboard"))
 
 	def copyLink(self):
 		"""Copy connection URL to clipboard.
diff --git a/source/globalCommands.py b/source/globalCommands.py
@@ -4892,7 +4892,11 @@ def script_toggleRemoteMute(self, gesture: "inputCore.InputGesture"):
 	)
 	@gui.blockAction.when(gui.blockAction.Context.REMOTE_ACCESS_DISABLED)
 	def script_pushClipboard(self, gesture: "inputCore.InputGesture"):
-		_remoteClient._remoteClient.pushClipboard()
+		try:
+			_remoteClient._remoteClient.pushClipboard()
+		except RuntimeError as e:
+			log.error("Error pushing clipboard to remote machine", exc_info=True)
+			ui.message(str(e))
 
 	@script(
 		# Translators: Documentation string for the script that copies a link to the remote session to the clipboard.
diff --git a/tests/unit/test_remote/test_remoteClient.py b/tests/unit/test_remote/test_remoteClient.py
@@ -120,8 +120,9 @@ def test_pushClipboardNoConnection(self):
 		# Without any transport (neither follower nor leader), pushClipboard should warn.
 		self.client.followerTransport = None
 		self.client.leaderTransport = None
-		self.client.pushClipboard()
-		self.uiMessage.assert_called_with("Not connected.")
+		with self.assertRaises(RuntimeError) as cm:
+			self.client.pushClipboard()
+		self.assertEqual(str(cm.exception), "Not connected.")
 
 	def test_pushClipboardWithTransport(self):
 		# With a fake transport, pushClipboard should send the clipboard text.
