Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-08-23 09:45:49 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix potential crash in audio macro action

Browse Source 
UpdateEntryData() could be called from ActionChanged() leading to a
potential double lock of switcher->m when triggerin other slots of this
widget
This commit is contained in:
WarmUpTill
2021-05-16 17:09:41 +02:00
committed by WarmUpTill
parent 2ce0b35921
commit 8f16d05a28
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/headers/macro-action-audio.hpp
View File

@@ -37,6 +37,7 @@ public:
MacroActionAudioEdit(
QWidget *parent,
std::shared_ptr<MacroActionAudio> entryData = nullptr);
void SetWidgetVisibility();
void UpdateEntryData();
static QWidget *Create(QWidget *parent,
std::shared_ptr<MacroAction> action)

27
src/macro-action-audio.cpp
View File

@@ -130,17 +130,8 @@ bool hasSourceControl(AudioAction action)
return action != AudioAction::MASTER_VOLUME;
}
void MacroActionAudioEdit::UpdateEntryData()
void MacroActionAudioEdit::SetWidgetVisibility()
{
if (!_entryData) {
return;
}
_audioSources->setCurrentText(
GetWeakSourceName(_entryData->_audioSource).c_str());
_actions->setCurrentIndex(static_cast<int>(_entryData->_action));
_volumePercent->setValue(_entryData->_volume);
if (hasVolumeControl(_entryData->_action)) {
_volumePercent->show();
} else {
@@ -154,6 +145,20 @@ void MacroActionAudioEdit::UpdateEntryData()
}
}
void MacroActionAudioEdit::UpdateEntryData()
{
if (!_entryData) {
return;
}
_audioSources->setCurrentText(
GetWeakSourceName(_entryData->_audioSource).c_str());
_actions->setCurrentIndex(static_cast<int>(_entryData->_action));
_volumePercent->setValue(_entryData->_volume);
SetWidgetVisibility();
}
void MacroActionAudioEdit::SourceChanged(const QString &text)
{
if (_loading || !_entryData) {
@@ -172,7 +177,7 @@ void MacroActionAudioEdit::ActionChanged(int value)
std::lock_guard<std::mutex> lock(switcher->m);
_entryData->_action = static_cast<AudioAction>(value);
UpdateEntryData();
SetWidgetVisibility();
}
void MacroActionAudioEdit::VolumeChanged(int value)