Merge branch '0.6.x'

Conflicts: NEWS src/mpdpp.cpp
2015-01-17 10:02:43 +01:00
parent 8e31f81ca9 af17e7eadf
commit 28f576dc08
3 changed files with 9 additions and 4 deletions
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -2623,7 +2623,7 @@ void seek()
 		Status::trace();
 		
 		unsigned howmuch = Config.incremental_seeking
-		                 ? (Timer-t).seconds()/2+Config.seek_time
+		                 ? (Timer-t).total_seconds()/2+Config.seek_time
 		                 : Config.seek_time;
 		
 		Key input = Key::read(*wFooter);