diff options
| author | Brian Ashworth <RedSoxFan@users.noreply.github.com> | 2018-07-16 22:12:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-16 22:12:29 -0400 |
| commit | 10fc7a5b494822a944bbada33b2cb25926447d76 (patch) | |
| tree | fb23163603e5ac4221d6ee27ff91dffb19e3295f | |
| parent | 75c699db62e63e2a3c2aa652c9ba9482a8f13ec3 (diff) | |
| parent | db3a36373435a34b8d0a5fc4e90eacaa2b1dae6b (diff) | |
| download | sway-10fc7a5b494822a944bbada33b2cb25926447d76.tar.xz | |
Merge branch 'master' into default-floating-border
| -rw-r--r-- | sway/config.c | 1 | ||||
| -rw-r--r-- | sway/tree/view.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sway/config.c b/sway/config.c index f63835bf..2c051146 100644 --- a/sway/config.c +++ b/sway/config.c @@ -474,7 +474,6 @@ static bool load_include_config(const char *path, const char *parent_dir, list_del(config->config_chain, index); return false; } - free(real_path); // restore current_config_path config->current_config_path = parent_config; diff --git a/sway/tree/view.c b/sway/tree/view.c index d9938130..70ab9364 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -1086,6 +1086,9 @@ bool view_is_visible(struct sway_view *view) { } void view_set_urgent(struct sway_view *view, bool enable) { + if (view_is_urgent(view) == enable) { + return; + } if (enable) { struct sway_seat *seat = input_manager_current_seat(input_manager); if (seat_get_focus(seat) == view->swayc) { |