From 4ff78d6304eaa492c68a51cea73909a2c4599b06 Mon Sep 17 00:00:00 2001
From: Andrzej Rybczak <electricityispower@gmail.com>
Date: Tue, 18 Sep 2012 18:26:50 +0200
Subject: [PATCH] fix handling playlist highlight

---
 src/playlist.cpp | 2 +-
 src/playlist.h   | 4 ++--
 src/status.cpp   | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/playlist.cpp b/src/playlist.cpp
index 38d24c2a..6ad07437 100644
--- a/src/playlist.cpp
+++ b/src/playlist.cpp
@@ -256,7 +256,7 @@ void Playlist::EnableHighlighting()
 
 void Playlist::UpdateTimer()
 {
-	itsTimer = Global::Timer;
+	std::time(&itsTimer);
 }
 
 std::string Playlist::TotalLength()
diff --git a/src/playlist.h b/src/playlist.h
index fe1f565f..72349489 100644
--- a/src/playlist.h
+++ b/src/playlist.h
@@ -72,7 +72,7 @@ struct Playlist: Screen<NC::Menu<MPD::Song>>, Filterable, HasSongs, Searchable,
 	
 	void EnableHighlighting();
 	void UpdateTimer();
-	timeval Timer() const { return itsTimer; }
+	time_t Timer() const { return itsTimer; }
 	
 	void PlayNewlyAddedSongs();
 	
@@ -99,7 +99,7 @@ private:
 	size_t itsRemainingTime;
 	size_t itsScrollBegin;
 	
-	timeval itsTimer;
+	time_t itsTimer;
 };
 
 extern Playlist *myPlaylist;
diff --git a/src/status.cpp b/src/status.cpp
index 25a2fc13..d98325f6 100644
--- a/src/status.cpp
+++ b/src/status.cpp
@@ -93,8 +93,7 @@ void Status::trace()
 	applyToVisibleWindows(&BaseScreen::update);
 	
 	if (isVisible(myPlaylist)
-	&&  Timer.tv_sec == myPlaylist->Timer().tv_sec+Config.playlist_disable_highlight_delay
-	&&  Timer.tv_usec > myPlaylist->Timer().tv_usec
+	&&  Timer.tv_sec == myPlaylist->Timer()+Config.playlist_disable_highlight_delay
 	&&  myPlaylist->main().isHighlighted()
 	&&  Config.playlist_disable_highlight_delay)
 	{