Ticket #6167: 6167-v2.diff

libs/libmythtv/tv_play.cpp

@@ -4081 +4081 @@
             if (ctx->HasNVP() && (12 & db_playback_exit_prompt))
             {
                 PromptStopWatchingRecording(ctx);
+                return handled;
             }
             else
             {
@@ -10699 +10700 @@
     else
         options += tr("Exit %1").arg(videotype);
 
-    if (IsDeleteAllowed(ctx))
+    if (!StateIsLiveTV(GetState(ctx)) && IsDeleteAllowed(ctx))
         options += tr("Delete this recording");
 
     options += tr("Keep watching");

libs/libmythtv/osd.cpp

@@ -2134 +2134 @@
     if (container)
     {
         VERBOSE(VB_IMPORTANT, LOC_ERR +
-                QString("NewDialogBox, dialog containter for "
+                QString("NewDialogBox, dialog container for "
                         "'%1' already exists.").arg(name));
         return;
     }