From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 5 Sep 2009 17:17:59 +0000 (+0200)
Subject: Bugfix: Initialize screens correctly when not using Xinerama (Thanks Mikael)
X-Git-Tag: 3.d-bf1~42
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=14a07d8b030514ec430bd1fed59e4a7a06f28750;p=i3%2Fi3

Bugfix: Initialize screens correctly when not using Xinerama (Thanks Mikael)
---

diff --git a/src/xinerama.c b/src/xinerama.c
index 59e7e225..f40ec84b 100644
--- a/src/xinerama.c
+++ b/src/xinerama.c
@@ -246,19 +246,18 @@ void initialize_xinerama(xcb_connection_t *conn) {
         if (!xcb_get_extension_data(conn, &xcb_xinerama_id)->present) {
                 LOG("Xinerama extension not found, disabling.\n");
                 disable_xinerama(conn);
-                return;
-        }
+        } else {
+                xcb_xinerama_is_active_reply_t *reply;
+                reply = xcb_xinerama_is_active_reply(conn, xcb_xinerama_is_active(conn), NULL);
 
-        xcb_xinerama_is_active_reply_t *reply;
-        reply = xcb_xinerama_is_active_reply(conn, xcb_xinerama_is_active(conn), NULL);
+                if (reply == NULL || !reply->state) {
+                        LOG("Xinerama is not active (in your X-Server), disabling.\n");
+                        disable_xinerama(conn);
+                } else
+                        query_screens(conn, virtual_screens);
 
-        if (reply == NULL || !reply->state) {
-                LOG("Xinerama is not active (in your X-Server), disabling.\n");
-                disable_xinerama(conn);
-        } else
-                query_screens(conn, virtual_screens);
-
-        FREE(reply);
+                FREE(reply);
+        }
 
         i3Screen *screen;
         num_screens = 0;