summaryrefslogtreecommitdiffstats
path: root/sway/ipc-server.c
diff options
context:
space:
mode:
authorLibravatar Kevin Hamacher <kevin.hamacher@rub.de>2015-12-14 11:43:17 +0100
committerLibravatar Kevin Hamacher <kevin.hamacher@rub.de>2015-12-14 11:43:17 +0100
commit64a183b23d2a0b2e628f641345e33d7ea46c0d07 (patch)
tree6afaf5b52ea1542d5068d7cc6a12b63dc236a95c /sway/ipc-server.c
parentFix rendering of borders on workspaces (swaybar) (diff)
downloadsway-64a183b23d2a0b2e628f641345e33d7ea46c0d07.tar.gz
sway-64a183b23d2a0b2e628f641345e33d7ea46c0d07.tar.zst
sway-64a183b23d2a0b2e628f641345e33d7ea46c0d07.zip
Fix dangling pointer on focus swap/describe WS
Diffstat (limited to 'sway/ipc-server.c')
-rw-r--r--sway/ipc-server.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/sway/ipc-server.c b/sway/ipc-server.c
index 7c737307..3f02812d 100644
--- a/sway/ipc-server.c
+++ b/sway/ipc-server.c
@@ -455,7 +455,11 @@ void ipc_get_outputs_callback(swayc_t *container, void *data) {
455void ipc_event_workspace(swayc_t *old, swayc_t *new) { 455void ipc_event_workspace(swayc_t *old, swayc_t *new) {
456 json_object *obj = json_object_new_object(); 456 json_object *obj = json_object_new_object();
457 json_object_object_add(obj, "change", json_object_new_string("focus")); 457 json_object_object_add(obj, "change", json_object_new_string("focus"));
458 json_object_object_add(obj, "old", ipc_json_describe_workspace(old)); 458 if (old) {
459 json_object_object_add(obj, "old", ipc_json_describe_workspace(old));
460 } else {
461 json_object_object_add(obj, "old", NULL);
462 }
459 json_object_object_add(obj, "current", ipc_json_describe_workspace(new)); 463 json_object_object_add(obj, "current", ipc_json_describe_workspace(new));
460 const char *json_string = json_object_to_json_string(obj); 464 const char *json_string = json_object_to_json_string(obj);
461 465