sanity checks in Map and Unmap

NotFound · NotFound · commit 2231ef909916 · 2011-12-11T20:17:18.000+01:00
diff --git a/src/Guitor.winxed b/src/Guitor.winxed
@@ -1407,12 +1407,18 @@ class Window : Drawable
     function Map()
     {
         __DEBUG__ && cry(__FUNCTION__);
-        getfun("XMapWindow")(self.display.xdisplay, self.xdrawable);
+        var xdrawable = self.xdrawable;
+        if (xdrawable == null || xdrawable == None)
+            throw "Can't Map window, not open";
+        getfun("XMapWindow")(self.display.xdisplay, xdrawable);
     }
     function Unmap()
     {
         __DEBUG__ && cry(__FUNCTION__);
-        getfun("XUnmapWindow")(self.display.xdisplay, self.xdrawable);
+        var xdrawable = self.xdrawable;
+        // Silently ignore the closed window cases
+        if (xdrawable != null && xdrawable != None)
+            getfun("XUnmapWindow")(self.display.xdisplay, xdrawable);
     }
     function ClearArea(int x, int y, int width, int height, int exposures)
     {

Original file line number	Diff line number	Diff line change
`@@ -1407,12 +1407,18 @@ class Window : Drawable`
`1407`	`1407`	`function Map()`
`1408`	`1408`	`{`
`1409`	`1409`	`__DEBUG__ && cry(__FUNCTION__);`
`1410`		`- getfun("XMapWindow")(self.display.xdisplay, self.xdrawable);`
	`1410`	`+ var xdrawable = self.xdrawable;`
	`1411`	`+ if (xdrawable == null \|\| xdrawable == None)`
	`1412`	`+ throw "Can't Map window, not open";`
	`1413`	`+ getfun("XMapWindow")(self.display.xdisplay, xdrawable);`
`1411`	`1414`	`}`
`1412`	`1415`	`function Unmap()`
`1413`	`1416`	`{`
`1414`	`1417`	`__DEBUG__ && cry(__FUNCTION__);`
`1415`		`- getfun("XUnmapWindow")(self.display.xdisplay, self.xdrawable);`
	`1418`	`+ var xdrawable = self.xdrawable;`
	`1419`	`+ // Silently ignore the closed window cases`
	`1420`	`+ if (xdrawable != null && xdrawable != None)`
	`1421`	`+ getfun("XUnmapWindow")(self.display.xdisplay, xdrawable);`
`1416`	`1422`	`}`
`1417`	`1423`	`function ClearArea(int x, int y, int width, int height, int exposures)`
`1418`	`1424`	`{`