From d6e011281e4ab8f65f9e0b78167db63326fcd462 Mon Sep 17 00:00:00 2001 From: Chris Jones Date: Thu, 1 Apr 2010 22:05:14 +0100 Subject: [PATCH] Prevent colourscheme oddness setting null foreground/background colours. Closes LP #553383 --- terminatorlib/prefseditor.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/terminatorlib/prefseditor.py b/terminatorlib/prefseditor.py index 9a829d7a..ed8a3d8e 100755 --- a/terminatorlib/prefseditor.py +++ b/terminatorlib/prefseditor.py @@ -958,15 +958,19 @@ class PrefsEditor: elif value == 'ambience': forecol = '#FFFFFF' backcol = '#300A24' + elif value == 'custom': + forecol = fore.get_color().to_string() + backcol = back.get_color().to_string() + else: + err('Unknown colourscheme value: %s' % value) + return - if forecol is not None: - fore.set_color(gtk.gdk.Color(forecol)) - if backcol is not None: - back.set_color(gtk.gdk.Color(backcol)) + fore.set_color(gtk.gdk.Color(forecol)) + back.set_color(gtk.gdk.Color(backcol)) - self.config['color_scheme'] = value self.config['foreground_color'] = forecol self.config['background_color'] = backcol + self.config['color_scheme'] = value self.config.save() def on_use_theme_colors_checkbutton_toggled(self, widget):