From aaa5c3927a65508a96a18163b1ff2ffa427f8d0b Mon Sep 17 00:00:00 2001
From: mampfes <mampfes@users.noreply.github.com>
Date: Sun, 11 Jun 2017 08:08:53 +0200
Subject: [PATCH] Various fixes added to PR

(fix) handle ImageWidget without linkedPage
(fix) set openHAB2 as default server
(fix) moved selection list and color picker to left (PR49e3d14)
(fix) altered colors (PR49e3d14)
---
 changelog.txt             |  6 ++++++
 default.py                | 20 +++++++++++---------
 resources/lib/openhab2.py |  5 ++++-
 resources/settings.xml    |  2 +-
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index 3296e9e..14159fa 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,9 @@
+V2.0.1 (11-Jun-2017)
+	(fix) handle ImageWidget without linkedPage
+	(fix) set openHAB2 as default server
+	(fix) moved selection list and color picker to left (PR49e3d14)
+	(fix) altered colors (PR49e3d14)
+
 V2.0.0 (10-Mar-2017)
 	(fix) fixed krypton support
 	(add) openhab2 support
diff --git a/default.py b/default.py
index 59f9027..f9d0d28 100644
--- a/default.py
+++ b/default.py
@@ -48,7 +48,17 @@ def build_menu(self):
 
         try:
             self.oh.load_sitemaps()
-            self.homepage = self.oh.sitemaps[ADDON.getSetting('sitemap')].load_page()
+            try:
+                sitemap = self.oh.sitemaps[ADDON.getSetting('sitemap')]
+            except KeyError:
+                # invalid sitemap -> close window immediately
+                debugPrint(1, "build_menu failed, host=%s, port=%s, auth=%s, sitemap=%s sitemaps=%s" %
+                       (ADDON.getSetting('host'), ADDON.getSetting('port'),
+                        ADDON.getSetting('authentication'), ADDON.getSetting('sitemap'), self.oh.sitemaps))
+                xbmcgui.Dialog().ok(ADDON.getLocalizedString(30007), ADDON.getLocalizedString(30206))
+                self.close()
+                ADDON.openSettings()
+            self.homepage = sitemap.load_page()
         except requests.exceptions.RequestException as e:
             # no connection to openhab server -> close window immediately
             debugPrint(1, "build_menu failed, host=%s, port=%s, auth=%s, e=%s" %
@@ -57,14 +67,6 @@ def build_menu(self):
             xbmcgui.Dialog().ok(ADDON.getLocalizedString(30007), ADDON.getLocalizedString(30201))
             self.close()
             ADDON.openSettings()
-        except KeyError:
-            # invalid sitemap -> close window immediately
-            debugPrint(1, "build_menu failed, host=%s, port=%s, auth=%s, sitemap=%s" %
-                   (ADDON.getSetting('host'), ADDON.getSetting('port'),
-                    ADDON.getSetting('authentication'), ADDON.getSetting('sitemap')))
-            xbmcgui.Dialog().ok(ADDON.getLocalizedString(30007), ADDON.getLocalizedString(30206))
-            self.close()
-            ADDON.openSettings()
         self.enter_sub_menu(self.homepage)
 
     def enter_sub_menu(self, page):
diff --git a/resources/lib/openhab2.py b/resources/lib/openhab2.py
index 2ac302e..767ac5b 100644
--- a/resources/lib/openhab2.py
+++ b/resources/lib/openhab2.py
@@ -510,7 +510,10 @@ def __init__(self, page, widgetData):
     @update_proxy
     def init(self, widgetData):
         super(ImageWidget, self).init(widgetData)
-        self.attribs['linkedPage'] = widgetData['linkedPage']  # don't create an extra Page because not used so far
+        if 'linkedPage' in widgetData:
+            self.attribs['linkedPage'] = widgetData['linkedPage']  # don't create an extra Page because not used so far
+        else:
+            self.attribs['linkedPage'] = None
         self.attribs['url'] = widgetData['url']
         self.attribs['refresh'] = int(widgetData.get('refresh', 0))
 
diff --git a/resources/settings.xml b/resources/settings.xml
index 2d6bb66..c7a817c 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <settings>
-  <setting label="30012" id="server" type="enum" lvalues="30120|30121" default="0"/>
+  <setting label="30012" id="server" type="enum" lvalues="30120|30121" default="1"/>
   <setting label="30000" id="host" type="text" default="127.0.0.1"/>
   <setting label="30001" id="port" type="number" default="8080"/>
   <setting label="30006" type="action" action="RunScript(script.module.openhab, show_sitemaps)"/>