Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixes on MarkWatched

	* MarkWatatched is tested on both sqlite3
	* MySQL now mark as watch even when there is a scan
  • Loading branch information...
commit bf64ad2cd5daffee1db99a1a39b3fa7105337204 1 parent fa8d7da
Gabriel Laskar authored
View
11 xbmc/video/windows/GUIWindowVideoBase.cpp
@@ -1498,13 +1498,6 @@ class CMarkWatchedJob : public CJob
{
if (!g_settings.GetCurrentProfile().canWriteDatabases())
return false;
- // dont allow update while scanning
- CGUIDialogVideoScan* pDialogScan = (CGUIDialogVideoScan*)g_windowManager.GetWindow(WINDOW_DIALOG_VIDEO_SCAN);
- if (pDialogScan && pDialogScan->IsScanning())
- {
- CGUIDialogOK::ShowAndGetInput(257, 0, 14057, 0);
- return false;
- }
MarkWatched(m_item, m_bMark);
@@ -1560,9 +1553,9 @@ class CMarkWatchedJob : public CJob
bool m_bMark;
};
-void CGUIWindowVideoBase::MarkWatched(const CFileItemPtr &item, bool bMark)
+void CGUIWindowVideoBase::MarkWatched(const CFileItemPtr &pItem, bool bMark)
{
- CJobManager::GetInstance().AddJob(new CMarkWatchedJob(item, bMark), 0);
+ CJobManager::GetInstance().AddJob(new CMarkWatchedJob(pItem, bMark), 0);
}
//Add change a title's name
View
2  xbmc/video/windows/GUIWindowVideoBase.h
@@ -40,7 +40,7 @@ class CGUIWindowVideoBase : public CGUIMediaWindow, public IBackgroundLoaderObse
void AddToDatabase(int iItem);
virtual void OnInfo(CFileItem* pItem, const ADDON::ScraperPtr& scraper);
virtual void OnStreamDetails(const CStreamDetails &details, const CStdString &strFileName, long lFileId);
- static void MarkWatched(const CFileItemPtr &item, bool bMark);
+ static void MarkWatched(const CFileItemPtr &pItem, bool bMark);
static void UpdateVideoTitle(const CFileItem* pItem);
/*! \brief Show the resume menu for this item (if it has a resume bookmark)
Please sign in to comment.
Something went wrong with that request. Please try again.