2 files changed, 16 insertions, 2 deletions
diff --git a/src/com/fourisland/fourpuzzle/Audio.java b/src/com/fourisland/fourpuzzle/Audio.java
index 9083d27..3283c68 100755
--- a/src/com/fourisland/fourpuzzle/Audio.java
+++ b/src/com/fourisland/fourpuzzle/Audio.java

@@ -62,6 +62,10 @@ public class Audio {
        if ((seq.getSequence() != null) && (seq.getSequence().equals(s)))
        {
            return;
+        } else {
+            seq.close();
+            
+            init();
        }
        
        try {
diff --git a/src/com/fourisland/fourpuzzle/util/MidiParser.java b/src/com/fourisland/fourpuzzle/util/MidiParser.java
index 84dea26..3d6c06b 100644
--- a/src/com/fourisland/fourpuzzle/util/MidiParser.java
+++ b/src/com/fourisland/fourpuzzle/util/MidiParser.java

@@ -55,7 +55,12 @@ public class MidiParser {
        {
            parseShortMessage((ShortMessage) mm,tick);
        } else {
-            currentTrack.add(new MidiEvent(mm, tick));
+            if (foundFirstReal)
+            {
+                currentTrack.add(new MidiEvent(mm, tick-firstReal));
+            } else {
+                currentTrack.add(new MidiEvent(mm, 0));
+            }
        }
    }
    
@@ -77,7 +82,12 @@ public class MidiParser {
            }   
        }
        
-        currentTrack.add(new MidiEvent(mm, tick-firstReal));
+        if (foundFirstReal)
+        {
+            currentTrack.add(new MidiEvent(mm, tick-firstReal));
+        } else {
+            currentTrack.add(new MidiEvent(mm, 0));
+        }
    }
 }