Save layout when splitting/closing split panes

guake/boxes.py

@@ -257,9 +257,9 @@ def restore_box_layout(self, box, panes: list):
                     Gtk.main_iteration()
 
             if cur["type"].endswith("v"):
-                box = box.split_v()
+                box = box.split_v_no_save()
             else:
-                box = box.split_h()
+                box = box.split_h_no_save()
             self.restore_box_layout(box.get_child1(), panes)
             self.restore_box_layout(box.get_child2(), panes)
         else:
@@ -462,7 +462,17 @@ def split_h(self):
     def split_v(self):
         return self.split(DualTerminalBox.ORIENT_H)
 
+    def split_h_no_save(self):
+        return self.split_no_save(DualTerminalBox.ORIENT_V)
+
+    def split_v_no_save(self):
+        return self.split_no_save(DualTerminalBox.ORIENT_H)
+
+    @save_tabs_when_changed
     def split(self, orientation):
+        self.split_no_save(orientation)
+
+    def split_no_save(self, orientation):
         notebook = self.get_notebook()
         parent = self.get_parent()  # RootTerminalBox
 
@@ -613,6 +623,7 @@ def grab_box_terminal_focus(self, box):
         else:
             box.get_terminal().grab_focus()
 
+    @save_tabs_when_changed
     def remove_dead_child(self, child):
         if self.get_child1() is child:
             living_child = self.get_child2()

guake/utils.py

@@ -70,9 +70,6 @@ def save_tabs_when_changed(func):
     """Decorator for save-tabs-when-changed"""
 
     def wrapper(*args, **kwargs):
-        func(*args, **kwargs)
-        log.debug("mom, I've been called: %s %s", func.__name__, func)
-
         # Find me the Guake!
         clsname = args[0].__class__.__name__
         g = None
@@ -87,6 +84,9 @@ def wrapper(*args, **kwargs):
         elif getattr(args[0], "notebook", None):
             g = args[0].notebook.guake
 
+        func(*args, **kwargs)
+        log.debug("mom, I've been called: %s %s", func.__name__, func)
+
         # Tada!
         if g and g.settings.general.get_boolean("save-tabs-when-changed"):
             g.save_tabs()

releasenotes/notes/save_subterminals-4d086becd64ffcfb.yaml

@@ -0,0 +1,6 @@
+release_summary: >
+  Guake now saves layout when splitting/closing split panes
+
+fixes:
+  - |
+      - A closed subterminal returns back after restarting Guake #1686