Skip to content

Commit 467ca4b

Browse files
committed
Fix music toggling
Sometimes (usually on first load) if you enabled the music it wouldn't start until you restarted the game.
1 parent a40bac3 commit 467ca4b

1 file changed

Lines changed: 1 addition & 5 deletions

File tree

lib/screens/tetris_game_screen.dart

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@ class _TetrisGameScreenState extends State<TetrisGameScreen>
186186
final wasRunning =
187187
gameLogic.isGameRunning && !gameLogic.isGameOver && !gameLogic.isPaused;
188188
if (wasRunning) gameLogic.pauseGame();
189-
_audioService.pauseMusic();
190189

191190
await Navigator.push(
192191
context,
@@ -195,7 +194,6 @@ class _TetrisGameScreenState extends State<TetrisGameScreen>
195194
settings: widget.settings,
196195
onRestart: () {
197196
gameLogic.startGame();
198-
if (widget.settings.musicEnabled) _audioService.startMusic();
199197
},
200198
onQuit: () {
201199
if (defaultTargetPlatform == TargetPlatform.android)
@@ -215,9 +213,6 @@ class _TetrisGameScreenState extends State<TetrisGameScreen>
215213
gameLogic.isPaused) {
216214
gameLogic.resumeGame();
217215
}
218-
if (mounted && widget.settings.musicEnabled) {
219-
_audioService.resumeMusic();
220-
}
221216
}
222217

223218
void _onGameStateChanged() {
@@ -348,6 +343,7 @@ class _TetrisGameScreenState extends State<TetrisGameScreen>
348343
switch (state) {
349344
case AppLifecycleState.paused:
350345
case AppLifecycleState.inactive:
346+
_audioService.pauseMusic();
351347
case AppLifecycleState.detached:
352348
// App is going to background or being minimized - pause the game
353349
if (gameLogic.isGameRunning &&

0 commit comments

Comments
 (0)