Skip to content

Commit

Permalink
#582: not a real fix (just gets rid of the logging error): we avoid t…
Browse files Browse the repository at this point in the history
…he race during signal exit, which will clear self._window

git-svn-id: https://xpra.org/svn/Xpra/trunk@6888 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Jul 10, 2014
1 parent 4cf492b commit 8ac791a
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion src/xpra/x11/gtk_x11/composite.py
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,12 @@ def set_pixmap():
pass
raise
if handle is None:
log("failed to name a window pixmap for %s: %s", self._window.xid, e)
#avoid race during signal exit, which will clear self._window:
win = self._window
xid = 0
if win:
xid = win.xid
log("failed to name a window pixmap for %#x: %s", xid, e)
self._cleanup_listening(listening)
else:
self._contents_handle = handle
Expand Down

0 comments on commit 8ac791a

Please sign in to comment.