X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FBaseDisplay.cc;fp=src%2FBaseDisplay.cc;h=5aecac891772c891e1609d394c907c9b27f3adb9;hb=9fe6b282c0a9c1bd5ce754bc0fbc0e7c619eab14;hp=320f2ba11d3b5e18f15f7a23623619210b4ead12;hpb=f7122039db43e473b4e7adade8b484eea071d802;p=chaz%2Fopenbox diff --git a/src/BaseDisplay.cc b/src/BaseDisplay.cc index 320f2ba1..5aecac89 100644 --- a/src/BaseDisplay.cc +++ b/src/BaseDisplay.cc @@ -493,20 +493,22 @@ ScreenInfo::ScreenInfo(BaseDisplay *d, unsigned int num) { on a pre-screen basis anyways. */ xinerama_active = XineramaIsActive(d->getXDisplay()); - /* - If Xinerama is being used, there there is only going to be one screen - present. We still, of course, want to use the screen class, but that is - why no screen number is used in this function call. There should never - be more than one screen present with Xinerama active. - */ - int num; - XineramaScreenInfo *info = XineramaQueryScreens(d->getXDisplay(), &num); - if (num > 0 && info) { - for (int i = 0; i < num; ++i) { - xinerama_areas.push_back(Rect(info[i].x_org, info[i].y_org, - info[i].width, info[i].height)); + if (xinerama_active) { + /* + If Xinerama is being used, there there is only going to be one screen + present. We still, of course, want to use the screen class, but that + is why no screen number is used in this function call. There should + never be more than one screen present with Xinerama active. + */ + int num; + XineramaScreenInfo *info = XineramaQueryScreens(d->getXDisplay(), &num); + if (num > 0 && info) { + for (int i = 0; i < num; ++i) { + xinerama_areas.push_back(Rect(info[i].x_org, info[i].y_org, + info[i].width, info[i].height)); + } + XFree(info); } - XFree(info); } } }