Skip to content

Commit

Permalink
handle pyvda failures more gracefully
Browse files Browse the repository at this point in the history
  • Loading branch information
totaam committed Jan 22, 2024
1 parent a73d119 commit 764fd4f
Showing 1 changed file with 11 additions and 3 deletions.
14 changes: 11 additions & 3 deletions xpra/client/gtk3/window_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -1610,12 +1610,20 @@ def get_desktop_workspace(self) -> int:

def get_window_workspace(self):
if WIN32:
from xpra.platform.win32.gui import get_window_handle
from pyvda.pyvda import AppView
try:
from xpra.platform.win32.gui import get_window_handle
from pyvda.pyvda import AppView
except ImportError as e:
workspacelog(f"unable to query workspace: {e}")
return 0
hwnd = get_window_handle(self)
if not hwnd:
return 0
return AppView(hwnd).desktop.number-1
try:
return AppView(hwnd).desktop.number-1
except Exception:
workspacelog("failed to query pyvda appview", exc_info=True)
return 0
return self.do_get_workspace(self.get_window(), "_NET_WM_DESKTOP", WORKSPACE_UNSET)

def do_get_workspace(self, target, prop:str, default_value=0) -> int:
Expand Down

0 comments on commit 764fd4f

Please sign in to comment.