Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Also test channel name when setting autotimer parents to timers #476

Merged
merged 2 commits into from
Nov 25, 2024
Merged

Also test channel name when setting autotimer parents to timers #476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61d7f75
Also test channel name when setting autotimer parents to timers
phunkyfish Nov 25, 2024
49cb67b
changelog and version 22.3.1
phunkyfish Nov 25, 2024
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 pvr.vuplus/addon.xml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="pvr.vuplus"
version="22.3.0"
version="22.3.1"
name="Enigma2 Client"
provider-name="Joerg Dembski and Ross Nicholson">
<requires>@ADDON_DEPENDS@
Expand Down
3 changes: 3 additions & 0 deletions pvr.vuplus/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
v22.3.1
- Also test channel name when setting autotimer parents to timers

v22.3.0
- Add expert setting to toggle using OpenWebIf internal MovieList on/off

Expand Down
3 changes: 2 additions & 1 deletion src/enigma2/Timers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1294,7 +1294,8 @@ bool Timers::TimerUpdatesAuto()
{
const std::string autotimerTag = ConvertToAutoTimerTag(autoTimer.GetTitle());

if (timer.GetType() == Timer::EPG_AUTO_ONCE && timer.ContainsTag(TAG_FOR_AUTOTIMER) && timer.ContainsTag(autotimerTag))
if (timer.GetType() == Timer::EPG_AUTO_ONCE && timer.ContainsTag(TAG_FOR_AUTOTIMER) &&
timer.ContainsTag(autotimerTag) && autoTimer.GetChannelName() == timer.GetChannelName())
{
timer.SetParentClientIndex(autoTimer.GetClientIndex());
continue;
Expand Down
Loading