Added tag 5.1 for changeset ce355cea9bb8

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 34bcd99..5f3b9c9 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -904,7 +904,7 @@ manage(Window w, XWindowAttributes *wa) {
        if(c->w == sw && c->h == sh) {
                c->x = sx;
                c->y = sy;
        if(c->w == sw && c->h == sh) {
                c->x = sx;
                c->y = sy;

-               c->bw = wa->border_width;
+               c->bw = 0;

        }
        else {
                if(c->x + c->w + 2 * c->bw > sx + sw)
        }
        else {
                if(c->x + c->w + 2 * c->bw > sx + sw)


@@ -1562,8 +1562,7 @@ updategeom(void) {
        XineramaScreenInfo *info = NULL;
 
        /* window area geometry */
        XineramaScreenInfo *info = NULL;
 
        /* window area geometry */

-       if(XineramaIsActive(dpy)) {
-               info = XineramaQueryScreens(dpy, &n);
+       if(XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) { 

                if(n > 1) {
                        int di, x, y;
                        unsigned int dui;
                if(n > 1) {
                        int di, x, y;
                        unsigned int dui;