Ticket #3711: mythvideo-bookmark.patch

programs/mythfrontend/main.cpp

@@ -585 +585 @@
     
     pginfo->title = title;
 
+    long long pos = 0;
+
     if (pginfo->pathname.startsWith("dvd:"))
     {
         bool allowdvdbookmark = gContext->GetNumSetting("EnableDVDBookmark", 0);
         pginfo->setIgnoreBookmark(!allowdvdbookmark);
-        if (allowdvdbookmark && 
-            gContext->GetNumSetting("DVDBookmarkPrompt", 0))
+        if (allowdvdbookmark && gContext->GetNumSetting("DVDBookmarkPrompt", 0))
         {
             RingBuffer *tmprbuf = new RingBuffer(pginfo->pathname, false);
+            
+            if (!tmprbuf)
+            {
+                delete pginfo;
+                return res;              
+            }
+            
             QString name;
             QString serialid;
-            if (tmprbuf->isDVD() &&
-                 tmprbuf->DVD()->GetNameAndSerialNum(name, serialid))
+            if (tmprbuf->isDVD() && tmprbuf->DVD()->GetNameAndSerialNum(name, serialid))
             {
                 QStringList fields = pginfo->GetDVDBookmark(serialid, false);
                 if (!fields.empty())
                 {
                     QStringList::Iterator it = fields.begin();
-                    long long pos = (long long)(atoi((*++it).ascii()) & 0xffffffffLL);
-                    if (pos > 0)
-                    {
-                        QString msg = QString("DVD contains a bookmark");
-                        QString button1msg = QString("Play from bookmark");
-                        QString button2msg = QString("Play from beginning");
-        
-                        int ret = MythPopupBox::show2ButtonPopup(gContext->GetMainWindow(),
-                                                            "", msg,
-                                                            button1msg,
-                                                            button2msg,
-                                                            1);
-                        if (ret == 1)
-                            pginfo->setIgnoreBookmark(true);
-                        else if (ret == -1)
-                        {
-                            delete tmprbuf;
-                            delete pginfo;
-                            return res;
-                        }
-                    }
+                    pos = (long long)(atoi((*++it).ascii()) & 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; 
+        QString button1msg = QString("Play from bookmark");
+        QString button2msg = QString("Play from beginning");
+        
+        if (pginfo->pathname.startsWith("dvd:"))
+           msg = QString("DVD contains a bookmark");
+        else
+           msg = QString("Video contains a bookmark");
+
+        int ret = MythPopupBox::show2ButtonPopup(gContext->GetMainWindow(),
+                                                 "", msg, button1msg, button2msg, 1);
+        if (ret == 1)
+           pginfo->setIgnoreBookmark(true);
+        else if (ret == -1)
+        {
+           delete pginfo;
+           return res;
+        }
+    }
 
     TV::StartTV(pginfo);