Fix inconsistencies regarding the user layout

Fixes #939.

diff --git a/src/desktop.c b/src/desktop.c
index 1ea2fc973373bee316201efd2b67c9a703f869d1..f8571226d020c82377c7a32ad92859e4571099ae 100644 (file)
--- 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 62eaa85df1bbd1525da7a558402b7b7c481475ae..a8198922a4bd702052b184270e1ab45a3f2d4dcc 100644 (file)
--- 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 {