Merge pull request #12985 from FernetMenta/lambda

VideoPlayer: lambda jobs must copy parameters
xbmc · Nov 1, 2017 · 00ffd3d · 00ffd3d
2 parents f2bc3ac + 3a4e179
commit 00ffd3d
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/xbmc/cores/VideoPlayer/VideoPlayer.cpp b/xbmc/cores/VideoPlayer/VideoPlayer.cpp
@@ -742,8 +742,11 @@ bool CVideoPlayer::CloseFile(bool reopen)
 {
   CLog::Log(LOGNOTICE, "CVideoPlayer::CloseFile()");
 
-  CJobManager::GetInstance().Submit([&]() {
-    m_callback.StoreVideoSettings(m_item, m_processInfo->GetVideoSettings());
+  IPlayerCallback *cb = &m_callback;
+  CFileItem fileItem(m_item);
+  CVideoSettings vs = m_processInfo->GetVideoSettings();
+  CJobManager::GetInstance().Submit([=]() {
+    cb->StoreVideoSettings(fileItem, vs);
   }, CJob::PRIORITY_NORMAL);
 
   // set the abort request so that other threads can finish up
@@ -2502,8 +2505,11 @@ void CVideoPlayer::HandleMessages()
     {
       CDVDMsgOpenFile &msg(*static_cast<CDVDMsgOpenFile*>(pMsg));
 
-      CJobManager::GetInstance().Submit([&]() {
-        m_callback.StoreVideoSettings(m_item, m_processInfo->GetVideoSettings());
+      IPlayerCallback *cb = &m_callback;
+      CFileItem fileItem(m_item);
+      CVideoSettings vs = m_processInfo->GetVideoSettings();
+      CJobManager::GetInstance().Submit([=]() {
+        cb->StoreVideoSettings(fileItem, vs);
       }, CJob::PRIORITY_NORMAL);
 
       m_item = msg.GetItem();