diff options
author | Be <be@mixxx.org> | 2020-12-10 08:18:45 -0600 |
---|---|---|
committer | Be <be@mixxx.org> | 2020-12-10 08:18:45 -0600 |
commit | f26b7fcc07f47ae1f349f4cd2c39418675c67eee (patch) | |
tree | 35420e2aec5c84b652735eadf37377b7e294b8d4 /src | |
parent | 2a4faf67f8e486515a4936547a4edc68dec5463f (diff) |
DlgPrefWaveform: don't require restart for overview change
Diffstat (limited to 'src')
-rw-r--r-- | src/preferences/dialog/dlgprefwaveform.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/preferences/dialog/dlgprefwaveform.cpp b/src/preferences/dialog/dlgprefwaveform.cpp index 48ac7bae01..03113b816e 100644 --- a/src/preferences/dialog/dlgprefwaveform.cpp +++ b/src/preferences/dialog/dlgprefwaveform.cpp @@ -115,14 +115,10 @@ DlgPrefWaveform::DlgPrefWaveform(QWidget* pParent, MixxxMainWindow* pMixxx, &WaveformWidgetFactory::waveformMeasured, this, &DlgPrefWaveform::slotWaveformMeasured); - // Don't automatically reload the skin after changing the overview type to - // work around macOS skin change crash. https://bugs.launchpad.net/mixxx/+bug/1877487 -#ifndef __APPLE__ connect(waveformOverviewComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &DlgPrefWaveform::slotSetWaveformOverviewType); -#endif connect(clearCachedWaveforms, &QAbstractButton::clicked, this, @@ -182,15 +178,10 @@ void DlgPrefWaveform::slotUpdate() { } void DlgPrefWaveform::slotApply() { - // Require restarting Mixxx to apply the new overview type in order to work - // around macOS skin change crash. https://bugs.launchpad.net/mixxx/+bug/1877487 -#ifdef __APPLE__ ConfigValue overviewtype = ConfigValue(waveformOverviewComboBox->currentIndex()); if (overviewtype != m_pConfig->get(ConfigKey("[Waveform]", "WaveformOverviewType"))) { m_pConfig->set(ConfigKey("[Waveform]", "WaveformOverviewType"), overviewtype); - notifyRebootNecessary(); } -#endif WaveformSettings waveformSettings(m_pConfig); waveformSettings.setWaveformCachingEnabled(enableWaveformCaching->isChecked()); waveformSettings.setWaveformGenerationWithAnalysisEnabled( @@ -240,12 +231,6 @@ void DlgPrefWaveform::slotResetToDefaults() { playMarkerPositionSlider->setValue(50); } -void DlgPrefWaveform::notifyRebootNecessary() { - // make the fact that you have to restart mixxx more obvious - QMessageBox::information( - this, tr("Information"), tr("Mixxx must be restarted to load the new overview type.")); -} - void DlgPrefWaveform::slotSetFrameRate(int frameRate) { WaveformWidgetFactory::instance()->setFrameRate(frameRate); } |