diff options
| author |  taiyu <taiyu.len@gmail.com> | 2015-08-17 11:25:36 -0700 |
|---|---|---|
| committer | taiyu <taiyu.len@gmail.com> | 2015-08-17 11:25:36 -0700 |
| commit | 0eed6a4f9930024132807a0f66e58c526d2aea4d (patch) | |
| tree | 638b7f33363ec25b13107f4dd9c3001cfb8a959b | |
| parent | fixed handling of views with override_redirect (dmenu) (diff) | |
| parent | Fix segfault from focus_view (diff) | |
| download | sway-0eed6a4f9930024132807a0f66e58c526d2aea4d.tar.gz sway-0eed6a4f9930024132807a0f66e58c526d2aea4d.tar.zst sway-0eed6a4f9930024132807a0f66e58c526d2aea4d.zip | |
Merge branch 'master' of https://github.com/SirCmpwn/sway
merging
| -rw-r--r-- | sway/layout.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sway/layout.c b/sway/layout.c index 1bc65050..f4079d4b 100644 --- a/sway/layout.c +++ b/sway/layout.c | |||
| @@ -285,6 +285,9 @@ void unfocus_all(swayc_t *container) { | |||
| 285 | } | 285 | } |
| 286 | 286 | ||
| 287 | void focus_view(swayc_t *view) { | 287 | void focus_view(swayc_t *view) { |
| 288 | if (!view) { | ||
| 289 | return; | ||
| 290 | } | ||
| 288 | sway_log(L_DEBUG, "Setting focus for %p:%ld", view, view->handle); | 291 | sway_log(L_DEBUG, "Setting focus for %p:%ld", view, view->handle); |
| 289 | swayc_t *c = view; | 292 | swayc_t *c = view; |
| 290 | //Set focus from root to view | 293 | //Set focus from root to view |