summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStuart Auchterlonie <stuarta@squashedfrog.net>2011-05-05 14:36:04 (GMT)
committer Stuart Auchterlonie <stuarta@squashedfrog.net>2011-05-05 14:36:04 (GMT)
commit16775c5ceb57dab11cade55e31225664007268ca (patch)
tree9f4dcb6e7a6a757a28dd854e282c536cd79c9823
parente751ba6c5edf1f6e11b9f830441892aa16d5ac69 (diff)
Refs #9761. Check to see if m_checkAvailabilityTimerId=0 before killing it.
Prevents the frontend issuing the following error message. "Application asked to unregister timer 0x0 which is not registered in this thread. Fix application." Thanks to Jonatan for the patch. Stuart
-rw-r--r--mythtv/programs/mythfrontend/playbackboxhelper.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/mythtv/programs/mythfrontend/playbackboxhelper.cpp b/mythtv/programs/mythfrontend/playbackboxhelper.cpp
index fac84dd..aae73b9 100644
--- a/mythtv/programs/mythfrontend/playbackboxhelper.cpp
+++ b/mythtv/programs/mythfrontend/playbackboxhelper.cpp
@@ -104,7 +104,7 @@ AvailableStatusType PBHEventHandler::CheckAvailability(const QStringList &slist)
m_checkAvailability.find(evinfo.MakeUniqueKey());
if (it != m_checkAvailability.end())
m_checkAvailability.erase(it);
- if (m_checkAvailability.empty())
+ if (m_checkAvailability.empty() && m_checkAvailabilityTimerId)
killTimer(m_checkAvailabilityTimerId);
}