[cleanup] drops unnecessary delay for setting Player.Seeking to false

2 files changed, 9 insertions, 15 deletions

diff --git a/xbmc/utils/SeekHandler.cpp b/xbmc/utils/SeekHandler.cpp
index 5cbafdacf5..f50d7769c9 100644
--- a/xbmc/utils/SeekHandler.cpp
+++ b/xbmc/utils/SeekHandler.cpp
@@ -184,24 +184,19 @@ bool CSeekHandler::InProgress() const
 
 void CSeekHandler::Process()
 {
-  if (m_timer.GetElapsedMilliseconds() > m_seekDelay)
+  if (m_timer.GetElapsedMilliseconds() > m_seekDelay && m_requireSeek)
   {
-    if (!g_infoManager.m_performingSeek && m_timer.GetElapsedMilliseconds() > time_for_display) // TODO: Why?
-      g_infoManager.SetSeeking(false);
+    g_infoManager.m_performingSeek = true;
 
-    if (m_requireSeek)
-    {
-      g_infoManager.m_performingSeek = true;
-
-      // reset seek step size
-      g_infoManager.SetSeekStepSize(0);
+    // reset seek step size
+    g_infoManager.SetSeekStepSize(0);
 
-      // calculate the seek time
-      double time = g_infoManager.GetTotalPlayTime() * m_percent * 0.01;
+    // calculate the seek time
+    double time = g_infoManager.GetTotalPlayTime() * m_percent * 0.01;
 
-      g_application.SeekTime(time);
-      m_requireSeek = false;
-    }
+    g_application.SeekTime(time);
+    m_requireSeek = false;
+    g_infoManager.SetSeeking(false);
   }
 }
 
diff --git a/xbmc/utils/SeekHandler.h b/xbmc/utils/SeekHandler.h
index a6de9ca67f..bae1506037 100644
--- a/xbmc/utils/SeekHandler.h
+++ b/xbmc/utils/SeekHandler.h
@@ -56,7 +56,6 @@ protected:
   virtual ~CSeekHandler();
 
 private:
-  static const int time_for_display = 2000; // TODO: WTF?
   static const int analogSeekDelay = 500;
   
   int        GetSeekSeconds(bool forward, SeekType type);