Skip to content

Commit

Permalink
if we destroy the same window twice, log a warning and avoid calling …
Browse files Browse the repository at this point in the history
…gtk's destroy function twice

git-svn-id: https://xpra.org/svn/Xpra/trunk@11653 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Jan 12, 2016
1 parent 9d5b08c commit 0f5a012
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/xpra/client/gtk_base/gtk_client_window_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -987,13 +987,17 @@ def move_resize(self, x, y, w, h, resize_counter=0):
self._set_backing_size(w, h)


def noop_destroy(self):
log.warn("Warning: window destroy called twice!")

def destroy(self):
if self._client._set_window_menu:
self._client.set_window_menu(False, self._id, {})
self.on_realize_cb = {}
ClientWindowBase.destroy(self)
gtk.Window.destroy(self)
self._unfocus()
self.destroy = self.noop_destroy


def do_unmap_event(self, event):
Expand Down

0 comments on commit 0f5a012

Please sign in to comment.