From 7d1c2ecbb4433f1bca6be6615f9be17fbbef3635 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Sat, 27 Jan 2007 17:53:56 +0000
Subject: Ooops

svn-id: r25227
---
 sound/mods/protracker.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'sound')

diff --git a/sound/mods/protracker.cpp b/sound/mods/protracker.cpp
index a0c8da45de..31f2264f8a 100644
--- a/sound/mods/protracker.cpp
+++ b/sound/mods/protracker.cpp
@@ -124,11 +124,11 @@ void ProtrackerStream::updateRow() {
 
 		int effect = note.effect >> 8;
 
-		_track[track].sample = note.sample;
-		if (_track[track].sample != note.sample) {
-			_track[track].vibratoPos = 0;
-		}
 		if (note.sample) {
+			if (_track[track].sample != note.sample) {
+				_track[track].vibratoPos = 0;
+			}
+			_track[track].sample = note.sample;
 			_track[track].vol = _module->sample[note.sample - 1].vol;
 		}
 		if (note.period) {
@@ -203,7 +203,7 @@ void ProtrackerStream::updateRow() {
 				_speed = exy;
 			} else {
 				_bpm = exy;
-				setInterruptFreq((int) (((double) _bpm) * 0.4));
+				setInterruptFreq((int) (getRate() / (_bpm * 0.4)));
 			}
 			break;
 		default:
-- 
cgit v1.2.3