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);