Ticket #3711: mythvideo-bookmark.2.diff

programs/mythfrontend/main.cpp

@@ -711 +711 @@
         pginfo->subtitle = QString( "%1: %2" ).arg(QObject::tr("Directed By")).arg(director);
 
     pginfo->title = title;
+    
+    long long pos = 0;
 
     if (pginfo->pathname.startsWith("dvd:"))
     {
@@ -720 +722 @@
             gContext->GetNumSetting("DVDBookmarkPrompt", 0))
         {
             RingBuffer *tmprbuf = new RingBuffer(pginfo->pathname, false);
+            
+            if (!tmprbuf)
+            {
+                delete pginfo;
+                return res;              
+            }
+      
             QString name;
             QString serialid;
             if (tmprbuf->isDVD() &&
@@ -729 +738 @@
                 if (!fields.empty())
                 {
                     QStringList::Iterator it = fields.begin();
-                    long long pos = (long long)
-                        ((*++it).toLongLong() & 0xffffffffLL);
-                    if (pos > 0)
-                    {
-                        QString msg = QObject::tr("DVD contains a bookmark");
-                        QString btn0msg = QObject::tr("Play from bookmark");
-                        QString btn1msg = QObject::tr("Play from beginning");
-
-                        DialogCode ret = MythPopupBox::Show2ButtonPopup(
-                            gContext->GetMainWindow(),
-                            "", msg,
-                            btn0msg,
-                            btn1msg,
-                            kDialogCodeButton0);
-                        if (kDialogCodeButton1 == ret)
-                            pginfo->setIgnoreBookmark(true);
-                        else if (kDialogCodeRejected == ret)
-                        {
-                            delete tmprbuf;
-                            delete pginfo;
-                            return res;
-                        }
-                    }
+                    pos = (long long)((*++it).toLongLong() & 0xffffffffLL);
                 }
             }
             delete tmprbuf;
         }
     }
+    else
+    {
+        bool allowdvdbookmark = gContext->GetNumSetting("EnableDVDBookmark", 0);
+        pginfo->setIgnoreBookmark(!allowdvdbookmark);
+        if (allowdvdbookmark && gContext->GetNumSetting("DVDBookmarkPrompt", 0))
+            pos = pginfo->GetBookmark();
+    }
+
+    if (pos > 0)
+    {
+        QString msg = QObject::tr("DVD contains a bookmark");
+        QString btn0msg = QObject::tr("Play from bookmark");
+        QString btn1msg = QObject::tr("Play from beginning");
+
+        DialogCode ret = MythPopupBox::Show2ButtonPopup(
+            gContext->GetMainWindow(),
+            "", msg,
+            btn0msg,
+            btn1msg,
+            kDialogCodeButton0);
+        if (kDialogCodeButton1 == ret)
+            pginfo->setIgnoreBookmark(true);
+        else if (kDialogCodeRejected == ret)
+        {
+            delete pginfo;
+            return res;
+        }
+    }
 
     TV::StartTV(pginfo);