revert to svn 2126 to stop some people crying

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2132 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: dc25ebc257
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2012-02-28 (Tue, 28 Feb 2012)

Origin message was:
------------------
- revert to svn 2126 to stop some people crying

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2132 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
This commit is contained in:
gixxpunk
2012-02-28 08:08:36 +00:00
parent f9f535e208
commit ca834e53fe
6 changed files with 7 additions and 12 deletions

View File

@@ -2318,14 +2318,10 @@ static void commandPauseScanning(int connfd, char *data, const unsigned dataLeng
if (scanning && pause)
{
scanning = 0;
dmxCN.request_pause();
pthread_cond_broadcast(&dmxCN.change_cond);
dmxEIT.request_pause();
pthread_cond_broadcast(&dmxEIT.change_cond);
#ifdef ENABLE_FREESATEPG
dmxFSEIT.request_pause();
pthread_cond_broadcast(&dmxFSEIT.change_cond);
#endif
#ifdef UPDATE_NETWORKS
dmxNIT.request_pause();
@@ -2334,6 +2330,7 @@ static void commandPauseScanning(int connfd, char *data, const unsigned dataLeng
#ifdef ENABLE_PPT
dmxPPT.request_pause();
#endif
scanning = 0;
}
else if (!pause && !scanning)
{