[seek] improves instant seek in seek handler

xbmc · Apr 10, 2015 · 64c51c2 · 64c51c2
1 parent 3fd4e1a
commit 64c51c2
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/xbmc/utils/SeekHandler.cpp b/xbmc/utils/SeekHandler.cpp
@@ -120,6 +120,12 @@ int CSeekHandler::GetSeekSeconds(bool forward, SeekType type)
 
 void CSeekHandler::Seek(bool forward, float amount, float duration /* = 0 */, bool analogSeek /* = false */, SeekType type /* = SEEK_TYPE_VIDEO */)
 {
+  CSingleLock lock(m_critSection);
+
+  // abort if we already perform a seek
+  if (g_infoManager.m_performingSeek)
+    return;
+
   // not yet seeking
   if (!m_requireSeek)
   {
@@ -222,7 +228,7 @@ bool CSeekHandler::InProgress() const
 
 void CSeekHandler::Process()
 {
-  if (m_timer.GetElapsedMilliseconds() > m_seekDelay && m_requireSeek)
+  if (m_timer.GetElapsedMilliseconds() >= m_seekDelay && m_requireSeek)
   {
     g_infoManager.m_performingSeek = true;