Added tag 3.8 for changeset 644b0798fccc

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index e487333..1206e95 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -586,12 +586,13 @@ run(void) {
 
 void
 setup(Bool topbar) {
 
 void
 setup(Bool topbar) {

-       int i, j, n, x, y;
-       XModifierKeymap *modmap;
-       XSetWindowAttributes wa;
+       int i, j, x, y;

 #if XINERAMA
 #if XINERAMA

+       int n;

        XineramaScreenInfo *info = NULL;
 #endif
        XineramaScreenInfo *info = NULL;
 #endif

+       XModifierKeymap *modmap;
+       XSetWindowAttributes wa;

 
        /* init modifier map */
        modmap = XGetModifierMapping(dpy);
 
        /* init modifier map */
        modmap = XGetModifierMapping(dpy);


@@ -618,9 +619,8 @@ setup(Bool topbar) {
        /* menu window geometry */
        mh = dc.font.height + 2;
 #if XINERAMA
        /* menu window geometry */
        mh = dc.font.height + 2;
 #if XINERAMA

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

                i = 0;
                i = 0;

-               info = XineramaQueryScreens(dpy, &n);

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