[Performous-commit] Tapio Vierros : If skipping 'instrumental break' during instrument splash, only skip to the song start.

[Tapio V. <aa...@us...>]

Module: performous
Branch: master
Commit: 24772c589de442eaf90bfc497669ec358fe9a4da

Author: Tapio Vierros <tap...@gm...>
Date:   Thu Jan  7 22:37:24 2010 +0200

If skipping 'instrumental break' during instrument splash, only skip to the song start.

---

 game/screen_sing.cc |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/game/screen_sing.cc b/game/screen_sing.cc
index 606658d..6c68573 100644
--- a/game/screen_sing.cc
+++ b/game/screen_sing.cc
@@ -235,8 +235,11 @@ void ScreenSing::manageEvent(SDL_Event event) {
 			}
 			// Skip instrumental breaks
 			else if (status == Song::INSTRUMENTAL_BREAK) {
-				double diff = m_layout_singer->lyrics_begin() - 3.0 - time;
-				if (diff > 0.0) m_audio.seek(diff);
+				if (time < 0) m_audio.seek(0.0);
+				else {
+					double diff = m_layout_singer->lyrics_begin() - 3.0 - time;
+					if (diff > 0.0) m_audio.seek(diff);
+				}
 			}
 		}
 		// Volume control