From e195f3c3156c46e386fb59d5a0232542a5fc7f87 Mon Sep 17 00:00:00 2001 From: FlatTV Date: Sun, 6 Nov 2016 20:51:09 +0100 Subject: [PATCH] timerlist: try to fix segfault in askUserOnTimerConflict() Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/b70160a992e07ae601637b982a8abe2ee6f74aa3 Author: FlatTV Date: 2016-11-06 (Sun, 06 Nov 2016) Origin message was: ------------------ - timerlist: try to fix segfault in askUserOnTimerConflict() --- src/gui/timerlist.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp index 76fd3b334..39b85c524 100644 --- a/src/gui/timerlist.cpp +++ b/src/gui/timerlist.cpp @@ -1822,8 +1822,10 @@ bool CTimerList::askUserOnRemoteTimerConflict(time_t announceTime, time_t stopTi bool askUserOnTimerConflict(time_t announceTime, time_t stopTime, t_channel_id channel_id) { //NI + bool useCI = false; CZapitChannel * channel = CServiceManager::getInstance()->FindChannel(channel_id); - bool useCI = channel->bUseCI; + if (channel) + useCI = channel->bUseCI; if (CFEManager::getInstance()->getEnabledCount() == 1 || useCI) { //NI CTimerdClient Timer;