sway

commit 6db92bbb99461791156b702fc84605f419707384
parent 0169ba02fa9a6e1900a36402a440d2688f79a668
Author: Mikkel Oscar Lyderik <mikkeloscar@gmail.com>
Date:   Thu, 31 Mar 2016 11:56:59 +0200

Merge pull request #558 from crondog/swaybarexit

Stop swaybar crashing without args
Diffstat:
M
swaybar/bar.c
 | 
14
+++++++++++---

1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/swaybar/bar.c b/swaybar/bar.c
@@ -199,9 +199,17 @@ static void terminate_status_command(pid_t pid) {
 }
 
 void bar_teardown(struct bar *bar) {
-	free_config(bar->config);
-	free_outputs(bar->outputs);
-	free_status_line(bar->status);
+	if (bar->config) {
+		free_config(bar->config);
+	}
+
+	if (bar->outputs) {
+		free_outputs(bar->outputs);
+	}
+
+	if (bar->status) {
+		free_status_line(bar->status);
+	}
 
 	/* close sockets/pipes */
 	if (bar->status_read_fd) {