stef_buwalda/pism
1
0
Fork 0
mirror of https://github.com/2OOP/pism.git synced 2026-02-04 19:04:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Development' into Development

Browse Source
This commit is contained in:
ramollia
2025-10-28 11:14:22 +01:00
parent 5b20909f80 00b5f9dced
commit 3a51434f91
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/toop/app/view/views/SendChallengeView.java
View File

@@ -25,7 +25,7 @@ public final class SendChallengeView extends View {
private final GameInformation.Player playerInformation; private final GameInformation.Player playerInformation;
public SendChallengeView(Server server, String opponent, BiConsumer<GameInformation.Player, String> onSend) { public SendChallengeView(Server server, String opponent, BiConsumer<GameInformation.Player, String> onSend) {
super(true, "bg-popup"); super(false, "bg-popup");
this.server = server; this.server = server;
this.opponent = opponent; this.opponent = opponent;

4
framework/src/main/java/org/toop/framework/audio/MusicManager.java
View File

@@ -175,7 +175,9 @@ public class MusicManager<T extends AudioResource> implements org.toop.framework
public void previous() { public void previous() {
if (backgroundMusic.isEmpty()) return; if (backgroundMusic.isEmpty()) return;
if (playingIndex == 0) return; if (playingIndex == 0) {
playingIndex = backgroundMusic.size();
}
stop(); stop();
scheduler.shutdownNow(); scheduler.shutdownNow();
playingIndex = playingIndex - 1; playingIndex = playingIndex - 1;