#1968: namedtuple cannot have '-' in its name, this caused the overla…

…y window setup to fail and left the display in an inconsistent state

git-svn-id: https://xpra.org/svn/Xpra/trunk@20582 3bb7dfac-3a0b-4e04-842a-767bc560f471

src/xpra/x11/server.py

@@ -240,13 +240,18 @@ def x11_init(self):
                     self.root_overlay = X11Window.XCompositeGetOverlayWindow(root.xid)
                     if self.root_overlay:
                         #ugly: API expects a window object with a ".xid"
-                        X11WindowModel = namedtuple("X11-WindowModel", "xid")
+                        X11WindowModel = namedtuple("X11WindowModel", "xid")
                         root_overlay = X11WindowModel(xid=self.root_overlay)
                         prop_set(root_overlay, "WM_TITLE", "latin1", u"RootOverlay")
                         X11Window.AllowInputPassthrough(self.root_overlay)
             except Exception as e:
+                log("XCompositeGetOverlayWindow(%#x)", root.xid, exc_info=True)
                 log.error("Error setting up xvfb synchronization:")
                 log.error(" %s", e)
+                if self.root_overlay:
+                    with xswallow:
+                        X11Window.XCompositeReleaseOverlayWindow(self.root_overlay)
+                    self.root_overlay = None
 
         ### Create the WM object
         self._wm = Wm(self.clobber, self.wm_name)