diff --git a/HCADecoder b/HCADecoder index d410765..d2788e7 160000 --- a/HCADecoder +++ b/HCADecoder @@ -1 +1 @@ -Subproject commit d41076523e10b33d3765f493b12162295ea01f49 +Subproject commit d2788e794e2099043dd47276dd4dc26629f842b7 diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 43bdd92..750b710 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -12,7 +12,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow), - dec() + dec(2) { ui->setupUi(this); @@ -190,7 +190,7 @@ void MainWindow::setBGM(const QString& qStr) std::string name = qStr.toUtf8().constData(); currSong = readablesong_to_filename[name]; BASS_ChannelPause(mix_stream); - dec.wait_for_finish(); + //dec.wait_for_finish(); BASS_Mixer_ChannelRemove(bgm->get_decode_channel()); bgm->unload(); bgm->load("res/" + currSong + "/bgm.hca");