[bug 971] - Save button throws KeyError when a multiple tab layout is…

terminatorlib/notebook.py

@@ -53,7 +53,7 @@ def __init__(self, window):
 
         self.show_all()
 
-    def configure(self):
+    def configure(self, clear_last_active_term = True):
         """Apply widget-wide settings"""
         # FIXME: The old reordered handler updated Terminator.terminals with
         # the new order of terminals. We probably need to preserve this for
@@ -76,7 +76,14 @@ def configure(self):
 #        style.xthickness = 0
 #        style.ythickness = 0
 #        self.modify_style(style)
-        self.last_active_term = {}
+
+        #when on_closebutton_clicked is called from prefseditor, it reconfigures
+        #the terminator. if they are cleared then
+        #self.last_active_term[self.get_nth_page(tabnum)] fails in container.py
+        #in describe_layout
+
+        if clear_last_active_term:
+            self.last_active_term = {}
 
     def create_window_detach(self, notebook, widget, x, y):
         """Create a window to contain a detached tab"""

terminatorlib/prefseditor.py

@@ -244,7 +244,7 @@ def on_closebutton_clicked(self, _button):
         """Close the window"""
         self.config.base.remove_config_with_suffix('_cur')
         terminator = Terminator()
-        terminator.reconfigure()
+        terminator.reconfigure(clear_last_active_term = False)
         self.window.destroy()
         self.calling_window.preventHide = False
         del(self)

terminatorlib/terminator.py

@@ -365,7 +365,7 @@ def on_gtk_theme_name_notify(self, settings, prop):
             self.cur_gtk_theme_name = new_gtk_theme_name
             self.reconfigure()
 
-    def reconfigure(self):
+    def reconfigure(self, clear_last_active_term = True):
         """Update configuration for the whole application"""
 
         if self.style_providers != []:
@@ -505,7 +505,7 @@ def reconfigure(self):
         for window in self.windows:
             child = window.get_child()
             if maker.isinstance(child, 'Notebook'):
-                child.configure()
+                child.configure(clear_last_active_term)
 
     def on_css_parsing_error(self, provider, section, error, user_data=None):
         """Report CSS parsing issues"""