From aa79f1630ed4b474d282d1f52cecc979bb71c7cd Mon Sep 17 00:00:00 2001 From: smlee Date: Mon, 20 Jan 2014 12:42:56 +0900 Subject: [PATCH 1/1] [hbbtv] fix crash restart after installation. remove useless initialization. --- lib/python/Plugins/Extensions/HbbTV/plugin.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/python/Plugins/Extensions/HbbTV/plugin.py b/lib/python/Plugins/Extensions/HbbTV/plugin.py index 50fa8fc..96d19cc 100644 --- a/lib/python/Plugins/Extensions/HbbTV/plugin.py +++ b/lib/python/Plugins/Extensions/HbbTV/plugin.py @@ -4,7 +4,6 @@ from Screens.Screen import Screen from Screens.InfoBar import InfoBar from Screens.ChoiceBox import ChoiceBox from Screens.MessageBox import MessageBox -from Screens.InfoBarGenerics import InfoBarNotifications from Screens.VirtualKeyBoard import VirtualKeyBoard from Screens.HelpMenu import HelpableScreen from Screens.ChannelSelection import service_types_tv @@ -834,7 +833,7 @@ class HandlerHbbTV(Handler): from libshm import SimpleSharedMemory _g_ssm_ = None -class HbbTVWindow(Screen, InfoBarNotifications): +class HbbTVWindow(Screen): skin = """ @@ -846,7 +845,6 @@ class HbbTVWindow(Screen, InfoBarNotifications): eRCInput.getInstance().lock() Screen.__init__(self, session) - InfoBarNotifications.__init__(self) self.__event_tracker = ServiceEventTracker(screen = self, eventmap = { iPlayableService.evStart: self._serviceStarted, iPlayableService.evEOF: self._serviceEOF, @@ -963,7 +961,7 @@ class HbbTVWindow(Screen, InfoBarNotifications): return self.setTitle(title) -class HbbTVHelper(Screen, InfoBarNotifications): +class HbbTVHelper(Screen): skin = """""" def __init__(self, session): global __gval__ @@ -971,7 +969,6 @@ class HbbTVHelper(Screen, InfoBarNotifications): __gval__.command_server = ServerFactory().doListenUnixTCP('/tmp/.sock.hbbtv.url', __gval__.hbbtv_handelr) Screen.__init__(self, session) - InfoBarNotifications.__init__(self) self._session = session @@ -2376,7 +2373,9 @@ class YoutubeTVSettings(ConfigListScreen, Screen): def auto_start_main(reason, **kwargs): if reason: command_server = getCommandServer() - command_server.stop() + try: + command_server.stop() + except: pass from Screens.HelpMenu import HelpableScreen def session_start_main(session, reason, **kwargs): -- 2.7.4