Merge branch 'master' into next

[i3/i3] / i3bar / src / child.c

diff --git a/i3bar/src/child.c b/i3bar/src/child.c
index 8d5e999ebf12b2de47294fde89dd4fef9c84563e..d0f0c5fbc67deb004a66f73752e1b2c4a533038c 100644 (file)
--- a/i3bar/src/child.c
+++ b/i3bar/src/child.c
@@ -520,33 +520,35 @@ void child_click_events_key(const char *key) {
  *
  */
 void send_block_clicked(int button, const char *name, const char *instance, int x, int y) {
-    if (child.click_events) {
-        child_click_events_initialize();
+    if (!child.click_events) {
+        return;
+    }
 
-        yajl_gen_map_open(gen);
+    child_click_events_initialize();
 
-        if (name) {
-            child_click_events_key("name");
-            yajl_gen_string(gen, (const unsigned char *)name, strlen(name));
-        }
+    yajl_gen_map_open(gen);
 
-        if (instance) {
-            child_click_events_key("instance");
-            yajl_gen_string(gen, (const unsigned char *)instance, strlen(instance));
-        }
+    if (name) {
+        child_click_events_key("name");
+        yajl_gen_string(gen, (const unsigned char *)name, strlen(name));
+    }
 
-        child_click_events_key("button");
-        yajl_gen_integer(gen, button);
+    if (instance) {
+        child_click_events_key("instance");
+        yajl_gen_string(gen, (const unsigned char *)instance, strlen(instance));
+    }
 
-        child_click_events_key("x");
-        yajl_gen_integer(gen, x);
+    child_click_events_key("button");
+    yajl_gen_integer(gen, button);
 
-        child_click_events_key("y");
-        yajl_gen_integer(gen, y);
+    child_click_events_key("x");
+    yajl_gen_integer(gen, x);
 
-        yajl_gen_map_close(gen);
-        child_write_output();
-    }
+    child_click_events_key("y");
+    yajl_gen_integer(gen, y);
+
+    yajl_gen_map_close(gen);
+    child_write_output();
 }
 
 /*