From 96d241e9f30e61ae06bfba0bd2c89328a3935e2f Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 20 Feb 2018 10:01:41 +0530 Subject: [PATCH] Fix enabled_layouts in session files not being respected --- kitty/session.py | 2 ++ kitty/tabs.py | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/kitty/session.py b/kitty/session.py index 75da65a0d..49fea3727 100644 --- a/kitty/session.py +++ b/kitty/session.py @@ -59,6 +59,8 @@ class Session: def set_enabled_layouts(self, raw): self.tabs[-1].enabled_layouts = to_layout_names(raw) + if self.tabs[-1].layout not in self.tabs[-1].enabled_layouts: + self.tabs[-1].layout = self.tabs[-1].enabled_layouts[0] def set_cwd(self, val): self.tabs[-1].cwd = val diff --git a/kitty/tabs.py b/kitty/tabs.py index fd84a6750..b71a3573b 100644 --- a/kitty/tabs.py +++ b/kitty/tabs.py @@ -107,12 +107,12 @@ class Tab: # {{{ return all_layouts[idx](self.os_window_id, self.id, self.opts, self.borders.border_width) def next_layout(self): - if len(self.opts.enabled_layouts) > 1: + if len(self.enabled_layouts) > 1: try: - idx = self.opts.enabled_layouts.index(self.current_layout.name) + idx = self.enabled_layouts.index(self.current_layout.name) except Exception: idx = -1 - nl = self.opts.enabled_layouts[(idx + 1) % len(self.opts.enabled_layouts)] + nl = self.enabled_layouts[(idx + 1) % len(self.enabled_layouts)] self.current_layout = self.create_layout_object(nl) self.relayout()