From 4e7c34694b6342d937a7d1dfac3320e8a49a2d7b Mon Sep 17 00:00:00 2001 From: Bastien Dejean Date: Tue, 5 Mar 2019 09:45:31 +0100 Subject: [PATCH] Fix inconsistencies regarding the user layout Fixes #939. --- src/desktop.c | 6 ++---- src/messages.c | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/desktop.c b/src/desktop.c index 1ea2fc9..f857122 100644 --- a/src/desktop.c +++ b/src/desktop.c @@ -165,11 +165,9 @@ bool set_layout(monitor_t *m, desktop_t *d, layout_t l, bool user) if (d == m->desk) { put_status(SBSC_MASK_REPORT); } - - return true; - } else { - return false; } + + return true; } void handle_presel_feedbacks(monitor_t *m, desktop_t *d) diff --git a/src/messages.c b/src/messages.c index 62eaa85..a819892 100644 --- a/src/messages.c +++ b/src/messages.c @@ -745,7 +745,7 @@ void cmd_desktop(char **args, int num, FILE *rsp) layout_t lyt; cycle_dir_t cyc; if (parse_cycle_direction(*args, &cyc)) { - ret = set_layout(trg.monitor, trg.desktop, (trg.desktop->layout + 1) % 2, true); + ret = set_layout(trg.monitor, trg.desktop, (trg.desktop->user_layout + 1) % 2, true); } else if (parse_layout(*args, &lyt)) { ret = set_layout(trg.monitor, trg.desktop, lyt, true); } else { -- 2.44.0