From 03a184775c190634da8374023a50a55aef6e8af3 Mon Sep 17 00:00:00 2001 From: Ace Date: Sun, 7 Jun 2020 15:57:38 +0200 Subject: [PATCH] Fix for issue #122 --- inkycal/config/layout.py | 2 ++ inkycal/config/settings_parser.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/inkycal/config/layout.py b/inkycal/config/layout.py index bdd24d0..8694639 100644 --- a/inkycal/config/layout.py +++ b/inkycal/config/layout.py @@ -37,6 +37,8 @@ class Layout: self.display_size = display_dimensions[model] if 'colour' in model: self.supports_colour = True + else: + self.supports_colour = False elif width and height: self.display_height = width diff --git a/inkycal/config/settings_parser.py b/inkycal/config/settings_parser.py index ba40727..8eca518 100644 --- a/inkycal/config/settings_parser.py +++ b/inkycal/config/settings_parser.py @@ -40,10 +40,10 @@ class Settings: os.chdir(folder) if os.path.exists('settings.jsonc'): with open("settings.jsonc") as jsonc_file: - #minify in order to remove comments + # minify in order to remove comments minified = jsmin(jsonc_file.read()) - #remove known invalid json (comma followed by closing accolades) + # remove known invalid json (comma followed by closing accolades) minified = minified.replace(",}","}") settings = json.loads(minified) self._settings = settings