bookmarks of items in the video library weren't being stored or retri…

…eved correctly
opdenkamp · Mar 19, 2012 · f849326 · f849326
1 parent 0692d0b
commit f849326
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp b/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp
@@ -142,7 +142,8 @@ void CGUIDialogVideoBookmarks::Update()
 
   // open the d/b and retrieve the bookmarks for the current movie
   CStdString path = g_application.CurrentFile();
-  if (g_application.CurrentFileItem().HasProperty("original_listitem_url"))
+  if (g_application.CurrentFileItem().HasProperty("original_listitem_url") && 
+     !URIUtils::IsVideoDb(g_application.CurrentFileItem().GetProperty("original_listitem_url").asString()))
     path = g_application.CurrentFileItem().GetProperty("original_listitem_url").asString();
   CVideoDatabase videoDatabase;
   videoDatabase.Open();
@@ -220,7 +221,8 @@ void CGUIDialogVideoBookmarks::ClearBookmarks()
   CVideoDatabase videoDatabase;
   videoDatabase.Open();
   CStdString path = g_application.CurrentFile();
-  if (g_application.CurrentFileItem().HasProperty("original_listitem_url"))
+  if (g_application.CurrentFileItem().HasProperty("original_listitem_url") && 
+     !URIUtils::IsVideoDb(g_application.CurrentFileItem().GetProperty("original_listitem_url").asString()))
     path = g_application.CurrentFileItem().GetProperty("original_listitem_url").asString();
   videoDatabase.ClearBookMarksOfFile(path, CBookmark::STANDARD);
   videoDatabase.ClearBookMarksOfFile(path, CBookmark::RESUME);
@@ -282,7 +284,8 @@ void CGUIDialogVideoBookmarks::AddBookmark(CVideoInfoTag* tag)
   else
   {
     CStdString path = g_application.CurrentFile();
-    if (g_application.CurrentFileItem().HasProperty("original_listitem_url"))
+    if (g_application.CurrentFileItem().HasProperty("original_listitem_url") && 
+       !URIUtils::IsVideoDb(g_application.CurrentFileItem().GetProperty("original_listitem_url").asString()))
       path = g_application.CurrentFileItem().GetProperty("original_listitem_url").asString();
     videoDatabase.AddBookMarkToFile(path, bookmark, CBookmark::STANDARD);
   }