From d3c9dc535b710c4bfbba98ba92f15a4bf323dae9 Mon Sep 17 00:00:00 2001
From: Benjamin Berg <benjamin@sipsolutions.net>
Date: Fri, 28 Aug 2009 18:48:13 +0200
Subject: [PATCH] Do not pop the error trap twice (pointed out by Sascha Silbe
 in #1123).

---
 src/sugar/wm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sugar/wm.py b/src/sugar/wm.py
index 21077719..3a63832f 100644
--- a/src/sugar/wm.py
+++ b/src/sugar/wm.py
@@ -29,7 +29,7 @@ def _property_get_trapped(window, prop, prop_type):
 
     # We just log a message
     error = gtk.gdk.error_trap_pop()
-    if gtk.gdk.error_trap_pop():
+    if error:
         logging.debug('Received X Error (%i) while getting '
                       'a property on a window' % error)