neutrino.cpp: stop radiotext when going to standby and in stop_daemons

This commit is contained in:
[CST] Focus
2012-10-15 13:02:03 +04:00
parent 2a93f2dfdf
commit b97ed139c4

View File

@@ -3200,6 +3200,9 @@ void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby )
/* wasshift = */ CRecordManager::getInstance()->StopAutoRecord(); /* wasshift = */ CRecordManager::getInstance()->StopAutoRecord();
if(mode == mode_radio && g_Radiotext)
g_Radiotext->radiotext_stop();
if(!fromDeepStandby && !CRecordManager::getInstance()->RecordingStatus()) { if(!fromDeepStandby && !CRecordManager::getInstance()->RecordingStatus()) {
g_Zapit->setStandby(true); g_Zapit->setStandby(true);
} else { } else {
@@ -3560,6 +3563,10 @@ void stop_daemons(bool stopall)
tuxtxt_stop(); tuxtxt_stop();
tuxtxt_close(); tuxtxt_close();
if (g_Radiotext) {
delete g_Radiotext;
g_Radiotext = NULL;
}
printf("httpd shutdown\n"); printf("httpd shutdown\n");
pthread_cancel(nhttpd_thread); pthread_cancel(nhttpd_thread);
pthread_join(nhttpd_thread, NULL); pthread_join(nhttpd_thread, NULL);