Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion epgrefresh/src/EPGRefresh.py
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ def cleanUp(self):
except:
pass
if config.plugins.epgrefresh.parse_autotimer.value:
self.maybeStopAdapter()
self.refreshAdapter.play(self.refreshAdapter.previousService)
try:
from Plugins.Extensions.AutoTimer.plugin import autotimer
if autotimer is None:
Expand Down
10 changes: 9 additions & 1 deletion epgrefresh/src/MainPictureAdapter.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@ def prepare(self):
Notifications.AddPopup(_("EPG refresh starts scanning channels."), MessageBox.TYPE_INFO, 4, NOTIFICATIONID)
except:
pass
self.wasInStandby = None
self.previousService = self.navcore.getCurrentlyPlayingServiceOrGroup()
if self.previousService is None and Screens.Standby.inStandby:
self.wasInStandby = True
self.previousService = eServiceReference(config.tv.lastservice.value)
try:
self.lastCount = Components.ServiceEventTracker.InfoBarCount
Expand All @@ -58,7 +60,13 @@ def stop(self):
self.rotorTimer.start(1500, True)
else:
if self.previousService is not None:
self.navcore.playService(self.previousService)
if self.wasInStandby:
from Screens.InfoBar import InfoBar
csel = InfoBar.instance and InfoBar.instance.servicelist
if csel:
csel.servicelist.setCurrent(self.previousService, adjust=False)
self.previousService = csel.getCurrentSelection()
self.navcore.playService(self.previousService, forceRestart=self.wasInStandby)
config.tv.lastservice.value = self.previousService.toString()
config.tv.lastservice.save()
else:
Expand Down
Loading