diff --git a/src/qt_gui/background_music_player.cpp b/src/qt_gui/background_music_player.cpp index b659d7965..4f2c5c69a 100644 --- a/src/qt_gui/background_music_player.cpp +++ b/src/qt_gui/background_music_player.cpp @@ -21,7 +21,7 @@ void BackgroundMusicPlayer::playMusic(const QString& snd0path) { } QUrl newMusic = QUrl::fromLocalFile(snd0path); if (m_mediaPlayer->playbackState() == QMediaPlayer::PlayingState && - m_currentMusic == newMusic) { + m_currentMusic == newMusic) { // already playing the correct music return; } diff --git a/src/qt_gui/background_music_player.h b/src/qt_gui/background_music_player.h index e999944a7..0c1fd3cf2 100644 --- a/src/qt_gui/background_music_player.h +++ b/src/qt_gui/background_music_player.h @@ -19,7 +19,6 @@ public: void playMusic(const QString& snd0path); void stopMusic(); - private: BackgroundMusicPlayer(QObject* parent = nullptr); ~BackgroundMusicPlayer(); diff --git a/src/qt_gui/main_window.cpp b/src/qt_gui/main_window.cpp index 3b6fab084..2234a4f48 100644 --- a/src/qt_gui/main_window.cpp +++ b/src/qt_gui/main_window.cpp @@ -508,7 +508,7 @@ void MainWindow::CreateConnects() { &MainWindow::PlayBackgroundMusic); } -void MainWindow::PlayBackgroundMusic () { +void MainWindow::PlayBackgroundMusic() { if (isGameRunning || !Config::getPlayBGM()) { BackgroundMusicPlayer::getInstance().stopMusic(); return; @@ -517,7 +517,7 @@ void MainWindow::PlayBackgroundMusic () { int itemID = isTableList ? m_game_list_frame->currentItem()->row() : m_game_grid_frame->crtRow * m_game_grid_frame->columnCnt + m_game_grid_frame->crtColumn; - + snd0path = QString::fromStdString(m_game_info->m_games[itemID].snd0_path); BackgroundMusicPlayer::getInstance().playMusic(snd0path); } diff --git a/src/qt_gui/settings_dialog.cpp b/src/qt_gui/settings_dialog.cpp index 94b17f032..c58adbd64 100644 --- a/src/qt_gui/settings_dialog.cpp +++ b/src/qt_gui/settings_dialog.cpp @@ -136,7 +136,6 @@ SettingsDialog::SettingsDialog(std::span physical_devices, QWidge }); connect(ui->playBGMCheckBox, &QCheckBox::stateChanged, this, [](int val) { Config::setPlayBGM(val); }); - } // GPU TAB