From 25d9ff302fb199d07a245d1d0c7fea972e45d87b Mon Sep 17 00:00:00 2001
From: bancika <bancika@Bancika-PC>
Date: Mon, 1 Jun 2020 11:55:29 +0200
Subject: [PATCH] Program won't start with some older configuration files due
 to different format of themes

---
 .../diylc-core/src/org/diylc/presenter/DrawingManager.java | 7 ++++++-
 diylc/diylc-core/src/org/diylc/presenter/update.xml        | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/diylc/diylc-core/src/org/diylc/presenter/DrawingManager.java b/diylc/diylc-core/src/org/diylc/presenter/DrawingManager.java
index 29647a71..310b01b5 100644
--- a/diylc/diylc-core/src/org/diylc/presenter/DrawingManager.java
+++ b/diylc/diylc-core/src/org/diylc/presenter/DrawingManager.java
@@ -116,8 +116,13 @@ public class DrawingManager {
     this.messageDispatcher = messageDispatcher;
     this.configManager = configManager;
     
-    this.theme = (Theme) configManager.readObject(IPlugInPort.THEME_KEY,
+    try {
+      this.theme = (Theme) configManager.readObject(IPlugInPort.THEME_KEY,
         Constants.DEFAULT_THEME);
+    } catch (Exception e) {
+      LOG.error("Error loading theme", e);
+      this.theme = Constants.DEFAULT_THEME;
+    }
         
     componentAreaMap = new HashMap<IDIYComponent<?>, ComponentArea>();
     lastDrawnStateMap = new HashMap<IDIYComponent<?>, ComponentState>();
diff --git a/diylc/diylc-core/src/org/diylc/presenter/update.xml b/diylc/diylc-core/src/org/diylc/presenter/update.xml
index 3a01fea0..1ad15be7 100644
--- a/diylc/diylc-core/src/org/diylc/presenter/update.xml
+++ b/diylc/diylc-core/src/org/diylc/presenter/update.xml
@@ -3137,6 +3137,10 @@
 				<org.diylc.appframework.update.Change>
 					<changeType>BUG_FIX</changeType>
 					<description>"Outline Mode" produces rendering issues when "Cache Boost" feature is enabled</description>
+				</org.diylc.appframework.update.Change>	
+				<org.diylc.appframework.update.Change>
+					<changeType>BUG_FIX</changeType>
+					<description>Program won't start with some older configuration files due to different format of themes</description>
 				</org.diylc.appframework.update.Change>									
 			</changes>
 			<url>https://github.com/bancika/diy-layout-creator/releases</url>