aboutsummaryrefslogtreecommitdiffstats
path: root/swaybar
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2018-04-24 19:57:03 +0200
committerLibravatar GitHub <noreply@github.com>2018-04-24 19:57:03 +0200
commit4779d8ca41fac7ef91888fc3477f16d24ff49cad (patch)
treed1de6034752d7cec56cdc1cdb598e87f6de68c7f /swaybar
parentDo not let tiled xwayland views do what they want (diff)
parentMerge pull request #1856 from Hello71/issue1855 (diff)
downloadsway-4779d8ca41fac7ef91888fc3477f16d24ff49cad.tar.gz
sway-4779d8ca41fac7ef91888fc3477f16d24ff49cad.tar.zst
sway-4779d8ca41fac7ef91888fc3477f16d24ff49cad.zip
Merge branch 'master' into master
Diffstat (limited to 'swaybar')
-rw-r--r--swaybar/bar.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/swaybar/bar.c b/swaybar/bar.c
index d407db4f..b4c0698f 100644
--- a/swaybar/bar.c
+++ b/swaybar/bar.c
@@ -162,9 +162,11 @@ static void wl_pointer_axis(void *data, struct wl_pointer *wl_pointer,
162 return; 162 return;
163 } 163 }
164 164
165 // last doesn't actually need initialization,
166 // but gcc (7.3.1) is too dumb to figure it out
165 struct swaybar_workspace *first = NULL; 167 struct swaybar_workspace *first = NULL;
166 struct swaybar_workspace *active = NULL; 168 struct swaybar_workspace *active = NULL;
167 struct swaybar_workspace *last; 169 struct swaybar_workspace *last = NULL;
168 170
169 struct swaybar_workspace *iter; 171 struct swaybar_workspace *iter;
170 wl_list_for_each(iter, &output->workspaces, link) { 172 wl_list_for_each(iter, &output->workspaces, link) {