From 8c666f653ae67443111f13f1ea25704c2c66fbde Mon Sep 17 00:00:00 2001
From: Shaun <shaun@bluebit.com.au>
Date: Mon, 10 Jun 2019 15:23:22 +1000
Subject: [PATCH] reset focus to the main menu on user switch

---
 addon.xml                                    | 2 +-
 resources/lib/server_detect.py               | 1 +
 resources/skins/skin.estuary/18/xml/Home.xml | 2 --
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/addon.xml b/addon.xml
index 15cae49..dde366b 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon  id="plugin.video.embycon" 
         name="EmbyCon"
-        version="1.9.7"
+        version="1.9.8"
         provider-name="Team B">
   <requires>
     <import addon="xbmc.python" version="2.25.0"/>
diff --git a/resources/lib/server_detect.py b/resources/lib/server_detect.py
index 625535f..3da40a2 100644
--- a/resources/lib/server_detect.py
+++ b/resources/lib/server_detect.py
@@ -374,4 +374,5 @@ def checkServer(force=False, change_user=False, notify=False):
             du.authenticate()
             du.getUserId()
             xbmc.executebuiltin("ActivateWindow(Home)")
+            xbmc.executebuiltin("SetFocus(9000, 0, absolute)")
             xbmc.executebuiltin("ReloadSkin()")
diff --git a/resources/skins/skin.estuary/18/xml/Home.xml b/resources/skins/skin.estuary/18/xml/Home.xml
index 289b656..31f6290 100644
--- a/resources/skins/skin.estuary/18/xml/Home.xml
+++ b/resources/skins/skin.estuary/18/xml/Home.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
 	<onunload>ClearProperty(first_load_done, 10000)</onunload>
-	<!--<onload>SetFocus(9000,99,absolute)</onload>-->
-	<onload>SetFocus(9000)</onload>
 	<defaultcontrol>9000</defaultcontrol>
 	<backgroundcolor>background</backgroundcolor>
 	<controls>