Merge branch 'master' into next

diff --git a/src/randr.c b/src/randr.c
index b8907b956e71698482b258407b772f8d7d622d39..68e8457f81bb6c95550e28a74740f95e67f6c412 100644 (file)
--- a/src/randr.c
+++ b/src/randr.c
@@ -845,9 +845,10 @@ void randr_init(int *event_base) {
     const xcb_query_extension_reply_t *extreply;
 
     extreply = xcb_get_extension_data(conn, &xcb_randr_id);
-    if (!extreply->present)
+    if (!extreply->present) {
         disable_randr(conn);
-    else randr_query_outputs();
+        return;
+    } else randr_query_outputs();
 
     if (event_base != NULL)
         *event_base = extreply->first_event;