jsonrpc: fix setting/updating resume point in VideoLibrary

xbmc · Jan 11, 2014 · 57e7305 · 57e7305
1 parent 20717c1
commit 57e7305
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/xbmc/interfaces/json-rpc/ServiceDescription.h b/xbmc/interfaces/json-rpc/ServiceDescription.h
@@ -22,7 +22,7 @@
 namespace JSONRPC
 {
   const char* const JSONRPC_SERVICE_ID          = "http://xbmc.org/jsonrpc/ServiceDescription.json";
-  const char* const JSONRPC_SERVICE_VERSION     = "6.13.2";
+  const char* const JSONRPC_SERVICE_VERSION     = "6.13.3";
   const char* const JSONRPC_SERVICE_DESCRIPTION = "JSON-RPC API of XBMC";
 
   const char* const JSONRPC_SERVICE_TYPES[] = {  

diff --git a/xbmc/interfaces/json-rpc/VideoLibrary.cpp b/xbmc/interfaces/json-rpc/VideoLibrary.cpp
@@ -980,15 +980,14 @@ void CVideoLibrary::UpdateResumePoint(const CVariant &parameterObject, CVideoInf
     else
     {
       CBookmark bookmark;
-      if (videodatabase.GetResumeBookMark(details.m_strFileNameAndPath, bookmark))
-      {
-        bookmark.timeInSeconds = position;
-
-        int total = (int)parameterObject["resume"]["total"].asInteger();
-        if (total > 0)
-          bookmark.totalTimeInSeconds = total;
-        videodatabase.AddBookMarkToFile(details.m_strFileNameAndPath, bookmark, CBookmark::RESUME);
-      }
+      int total = (int)parameterObject["resume"]["total"].asInteger();
+      if (total <= 0 && !videodatabase.GetResumeBookMark(details.m_strFileNameAndPath, bookmark))
+        bookmark.totalTimeInSeconds = details.m_streamDetails.GetVideoDuration();
+      else
+        bookmark.totalTimeInSeconds = total;
+
+      bookmark.timeInSeconds = position;
+      videodatabase.AddBookMarkToFile(details.m_strFileNameAndPath, bookmark, CBookmark::RESUME);
     }
   }
 }