From d4703179f07c7c3e57c5c5de57a8020524576a5a Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Sat, 21 Aug 2010 10:11:15 +0000 Subject: [PATCH] Fix crash after txt not found on TP; Not ask about recording in case of auto timeshift git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@735 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/474c348fa86889e138a31367966c73f8010e4480 Author: [CST] Focus Date: 2010-08-21 (Sat, 21 Aug 2010) ------------------ This commit was generated by Migit --- lib/libtuxtxt/tuxtxt.cpp | 2 ++ src/neutrino.cpp | 12 +++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/libtuxtxt/tuxtxt.cpp b/lib/libtuxtxt/tuxtxt.cpp index 59e85c922..71bc6040e 100644 --- a/lib/libtuxtxt/tuxtxt.cpp +++ b/lib/libtuxtxt/tuxtxt.cpp @@ -2125,8 +2125,10 @@ int Init() getpidsdone = -1; /* don't kill thread */ if (GetTeletextPIDs() == 0) { +#if 0 FTC_Manager_Done(manager); FT_Done_FreeType(library); +#endif return 0; } diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 0f5ca2d31..accae3879 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -3698,9 +3698,15 @@ extern time_t timer_minutes; void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode) { - if (!recordingstatus || - ShowLocalizedMessage(LOCALE_MESSAGEBOX_INFO, LOCALE_SHUTDOWN_RECODING_QUERY, CMessageBox::mbrNo, CMessageBox::mbYes | CMessageBox::mbNo, NULL, 450, 30, true) == CMessageBox::mbrYes) - { + bool do_shutdown = true; + + if(recordingstatus && !autoshift) { + do_shutdown = + (ShowLocalizedMessage(LOCALE_MESSAGEBOX_INFO, LOCALE_SHUTDOWN_RECODING_QUERY, CMessageBox::mbrNo, + CMessageBox::mbYes | CMessageBox::mbNo, NULL, 450, 30, true) == CMessageBox::mbrYes); + } + + if(do_shutdown) { if(recordingstatus) { CVCRControl::getInstance()->Stop(); g_Timerd->stopTimerEvent(recording_id);