Skip to content

Commit

Permalink
swallow X11 exceptions we may get when trying to raise a window, add …
Browse files Browse the repository at this point in the history
…missing context - we'll get the error later anyway if the window is 'bad'

git-svn-id: https://xpra.org/svn/Xpra/trunk@20889 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Oct 31, 2018
1 parent 043618f commit e88ecaa
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/xpra/x11/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -733,7 +733,8 @@ def reset_focus():
focuslog.warn("Warning: window %s is no longer managed!", window)
return
focuslog("focus: giving focus to %s", window)
window.raise_window()
with xswallow:
window.raise_window()
window.give_client_focus()
if server_source and modifiers is not None:
make_keymask_match = getattr(server_source, "make_keymask_match", None)
Expand Down Expand Up @@ -1050,7 +1051,7 @@ def _move_pointer(self, wid, pos, *args):
mouselog("_move_pointer(%s, %s) invalid window id", wid, pos)
else:
mouselog("raising %s", window)
with xsync:
with xswallow:
window.raise_window()
X11ServerBase._move_pointer(self, wid, pos, *args)

Expand Down

0 comments on commit e88ecaa

Please sign in to comment.