Fixed crashes when importing beatmaps (due to more async issues).

Don't call MusicController.loopTrackIfEnded() if a beatmap reloading thread is running.

Other changes:
- Fixed issue where long download result text would be drawn outside the result area by adding a clip.
- Changed default music offset from -150ms to -75ms.

Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>

src/itdelatrisu/opsu/Options.java

@@ -179,7 +179,7 @@ public class Options {
 		},
 		EFFECT_VOLUME ("Effect Volume", "Volume of menu and game sounds.", 70, 0, 100),
 		HITSOUND_VOLUME ("Hit Sound Volume", "Volume of hit sounds.", 30, 0, 100),
-		MUSIC_OFFSET ("Music Offset", "Adjust this value if hit objects are out of sync.", -150, -500, 500) {
+		MUSIC_OFFSET ("Music Offset", "Adjust this value if hit objects are out of sync.", -75, -500, 500) {
 			@Override
 			public String getValueString() { return String.format("%dms", val); }
 		},

src/itdelatrisu/opsu/downloads/DownloadNode.java

@@ -149,6 +149,14 @@ public class DownloadNode {
 		        (cy > buttonBaseY && cy < buttonBaseY + buttonOffset * maxResultsShown));
 	}
 
+	/**
+	 * Sets a clip to the download result button area.
+	 * @param g the graphics context
+	 */
+	public static void clipToResultArea(Graphics g) {
+		g.setClip((int) buttonBaseX, (int) buttonBaseY, (int) buttonWidth, (int) (buttonOffset * maxResultsShown));
+	}
+
 	/**
 	 * Returns true if the coordinates are within the bounds of the
 	 * download information button at the given index.
@@ -332,6 +340,7 @@ public class DownloadNode {
 		textX += img.getWidth() + buttonWidth * 0.001f;
 
 		// text
+		// TODO: if the title/artist line is too long, shorten it (e.g. add "...")
 		if (Options.useUnicodeMetadata())  // load glyphs
 			Utils.loadGlyphs(Utils.FONT_BOLD, getTitle(), getArtist());
 		Utils.FONT_BOLD.drawString(

src/itdelatrisu/opsu/states/DownloadsMenu.java

@@ -255,6 +255,7 @@ public class DownloadsMenu extends BasicGameState {
 		// search results
 		DownloadNode[] nodes = resultList;
 		if (nodes != null) {
+			DownloadNode.clipToResultArea(g);
 			int maxResultsShown = DownloadNode.maxResultsShown();
 			for (int i = 0; i < maxResultsShown; i++) {
 				int index = startResult + i;
@@ -263,6 +264,7 @@ public class DownloadsMenu extends BasicGameState {
 				nodes[index].drawResult(g, i, DownloadNode.resultContains(mouseX, mouseY, i),
 						(index == focusResult), (previewID == nodes[index].getID()));
 			}
+			g.clearClip();
 
 			// scroll bar
 			if (nodes.length > maxResultsShown)
@@ -333,7 +335,8 @@ public class DownloadsMenu extends BasicGameState {
 	public void update(GameContainer container, StateBasedGame game, int delta)
 			throws SlickException {
 		UI.update(delta);
-		MusicController.loopTrackIfEnded(false);
+		if (importThread == null)
+			MusicController.loopTrackIfEnded(false);
 		int mouseX = input.getMouseX(), mouseY = input.getMouseY();
 		UI.getBackButton().hoverUpdate(delta, mouseX, mouseY);
 		prevPage.hoverUpdate(delta, mouseX, mouseY);

src/itdelatrisu/opsu/states/SongMenu.java

@@ -465,7 +465,8 @@ public class SongMenu extends BasicGameState {
 	public void update(GameContainer container, StateBasedGame game, int delta)
 			throws SlickException {
 		UI.update(delta);
-		MusicController.loopTrackIfEnded(true);
+		if (reloadThread == null)
+			MusicController.loopTrackIfEnded(true);
 		int mouseX = input.getMouseX(), mouseY = input.getMouseY();
 		UI.getBackButton().hoverUpdate(delta, mouseX, mouseY);
 		selectModsButton.hoverUpdate(delta, mouseX, mouseY);