diff options
| author |  Ryan Dwyer <ryandwyer1@gmail.com> | 2018-06-24 13:08:47 +1000 |
|---|---|---|
| committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-06-24 13:08:47 +1000 |
| commit | 33e03cb27795b267bcd3c7508363ec8f95127e95 (patch) | |
| tree | 6a4241fd698cbdb6d6f17d9e4df83f403518745c /sway/desktop/output.c | |
| parent | Force transactions to complete in order (diff) | |
| download | sway-33e03cb27795b267bcd3c7508363ec8f95127e95.tar.gz sway-33e03cb27795b267bcd3c7508363ec8f95127e95.tar.zst sway-33e03cb27795b267bcd3c7508363ec8f95127e95.zip | |
Fix crash related to stacks and tabs
Diffstat (limited to 'sway/desktop/output.c')
| -rw-r--r-- | sway/desktop/output.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 1ca48975..790751c3 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c | |||
| @@ -714,7 +714,7 @@ static void render_container_tabbed(struct sway_output *output, | |||
| 714 | struct sway_seat *seat = input_manager_current_seat(input_manager); | 714 | struct sway_seat *seat = input_manager_current_seat(input_manager); |
| 715 | struct sway_container *focus = seat_get_focus(seat); | 715 | struct sway_container *focus = seat_get_focus(seat); |
| 716 | struct sway_container *current = seat_get_active_current_child(seat, con); | 716 | struct sway_container *current = seat_get_active_current_child(seat, con); |
| 717 | struct border_colors *current_colors = NULL; | 717 | struct border_colors *current_colors = &config->border_colors.unfocused; |
| 718 | struct sway_container_state *pstate = &con->current; | 718 | struct sway_container_state *pstate = &con->current; |
| 719 | 719 | ||
| 720 | // Render tabs | 720 | // Render tabs |
| @@ -778,7 +778,7 @@ static void render_container_stacked(struct sway_output *output, | |||
| 778 | struct sway_seat *seat = input_manager_current_seat(input_manager); | 778 | struct sway_seat *seat = input_manager_current_seat(input_manager); |
| 779 | struct sway_container *focus = seat_get_focus(seat); | 779 | struct sway_container *focus = seat_get_focus(seat); |
| 780 | struct sway_container *current = seat_get_active_current_child(seat, con); | 780 | struct sway_container *current = seat_get_active_current_child(seat, con); |
| 781 | struct border_colors *current_colors = NULL; | 781 | struct border_colors *current_colors = &config->border_colors.unfocused; |
| 782 | struct sway_container_state *pstate = &con->current; | 782 | struct sway_container_state *pstate = &con->current; |
| 783 | 783 | ||
| 784 | // Render titles | 784 | // Render titles |