From 1650b0692d547517946513648068ccc1a65f6e6e Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Thu, 17 Mar 2022 16:31:14 -0300 Subject: [PATCH] CMI8x38: Fix for logging status bar segfault --- src/qt/qt_mainwindow.cpp | 2 +- src/qt/qt_progsettings.cpp | 2 +- src/sound/snd_cmi8x38.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qt/qt_mainwindow.cpp b/src/qt/qt_mainwindow.cpp index 1d558c38b..ecfaef9f9 100644 --- a/src/qt/qt_mainwindow.cpp +++ b/src/qt/qt_mainwindow.cpp @@ -248,7 +248,7 @@ MainWindow::MainWindow(QWidget *parent) : connect(this, &MainWindow::updateStatusBarTip, status.get(), &MachineStatus::updateTip); connect(this, &MainWindow::updateStatusBarActivity, status.get(), &MachineStatus::setActivity); connect(this, &MainWindow::updateStatusBarEmpty, status.get(), &MachineStatus::setEmpty); - connect(this, &MainWindow::statusBarMessage, status.get(), &MachineStatus::message); + connect(this, &MainWindow::statusBarMessage, status.get(), &MachineStatus::message, Qt::QueuedConnection); ui->actionKeyboard_requires_capture->setChecked(kbd_req_capture); ui->actionRight_CTRL_is_left_ALT->setChecked(rctrl_is_lalt); diff --git a/src/qt/qt_progsettings.cpp b/src/qt/qt_progsettings.cpp index 9e39c4844..d5bfdaa2f 100644 --- a/src/qt/qt_progsettings.cpp +++ b/src/qt/qt_progsettings.cpp @@ -131,7 +131,7 @@ void ProgSettings::accept() connect(main_window, &MainWindow::updateStatusBarTip, main_window->status.get(), &MachineStatus::updateTip); connect(main_window, &MainWindow::updateStatusBarActivity, main_window->status.get(), &MachineStatus::setActivity); connect(main_window, &MainWindow::updateStatusBarEmpty, main_window->status.get(), &MachineStatus::setEmpty); - connect(main_window, &MainWindow::statusBarMessage, main_window->status.get(), &MachineStatus::message); + connect(main_window, &MainWindow::statusBarMessage, main_window->status.get(), &MachineStatus::message, Qt::QueuedConnection); QDialog::accept(); } diff --git a/src/sound/snd_cmi8x38.c b/src/sound/snd_cmi8x38.c index 1a7f690dd..2b690c627 100644 --- a/src/sound/snd_cmi8x38.c +++ b/src/sound/snd_cmi8x38.c @@ -1276,7 +1276,7 @@ cmi8x38_speed_changed(void *priv) dev->dma[i].timer_latch = (uint64_t) ((double) TIMER_USEC * freq); /* Calculate channel count and set DMA timer period. */ - if ((dev->type == CMEDIA_CMI8338) || (i == 0)) { + if ((dev->type == CMEDIA_CMI8338) || (i == 0)) { /* multi-channel requires channel 1 */ stereo: dev->dma[i].channels = 2; } else { @@ -1297,7 +1297,7 @@ stereo: freqreg >>= 3; } -#if 0 +#ifdef ENABLE_CMI8X38_LOG if (cmi8x38_do_log) ui_sb_bugui(buf); #endif