diff -Naur MythOrig/mythtv/libs/libmythtv/recorders/channelbase.cpp MythChannelChange/mythtv/libs/libmythtv/recorders/channelbase.cpp
|
old
|
new
|
|
| 849 | 849 | /// \note m_system_lock must be held when this is called |
| 850 | 850 | void ChannelBase::HandleScriptEnd(bool ok) |
| 851 | 851 | { |
| 852 | | LOG(VB_CHANNEL, LOG_INFO, LOC + QString("Channel change script %1") |
| 853 | | .arg((ok) ? "succeeded" : "failed")); |
| 854 | | |
| 855 | 852 | if (ok) |
| 856 | 853 | { |
| | 854 | LOG(VB_CHANNEL, LOG_INFO, LOC + QString("Channel change script succeeded.") |
| | 855 | |
| 857 | 856 | InputMap::const_iterator it = m_inputs.find(m_currentInputID); |
| 858 | 857 | if (it != m_inputs.end()) |
| 859 | 858 | { |
| … |
… |
|
| 861 | 860 | (*it)->startChanNum = m_curchannelname; |
| 862 | 861 | } |
| 863 | 862 | } |
| | 863 | else |
| | 864 | { |
| | 865 | LOG(VB_GENERAL, LOG_ERR, LOC + "Channel change script failed.") |
| | 866 | } |
| 864 | 867 | } |
| 865 | 868 | |
| 866 | 869 | /** \fn ChannelBase::GetCardID(void) const |
