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

Fix crash on shutdown related to macro docks

Browse Source 
It could happen that the macro was already deleted while the macro dock
was still attempting to update its displayed information.
This commit is contained in:
WarmUpTill 2023-09-13 17:07:58 +02:00 committed by WarmUpTill
parent d6e4ee0203
commit fc1460e592
3 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/macro-core/macro-dock.cpp
View File

@ -6,7 +6,7 @@
namespace advss {
MacroDock::MacroDock(Macro *m, QWidget *parent,
MacroDock::MacroDock(std::weak_ptr<Macro> m, QWidget *parent,
const StringVariable &runButtonText,
const StringVariable &pauseButtonText,
const StringVariable &unpauseButtonText,
@ -25,11 +25,12 @@ MacroDock::MacroDock(Macro *m, QWidget *parent,
_statusText(new QLabel(conditionsFalseText.c_str())),
_macro(m)
{
if (_macro) {
setWindowTitle(QString::fromStdString(_macro->Name()));
_run->setVisible(_macro->DockHasRunButton());
_pauseToggle->setVisible(_macro->DockHasPauseButton());
_statusText->setVisible(_macro->DockHasStatusLabel());
auto macro = _macro.lock();
if (macro) {
setWindowTitle(QString::fromStdString(macro->Name()));
_run->setVisible(macro->DockHasRunButton());
_pauseToggle->setVisible(macro->DockHasPauseButton());
_statusText->setVisible(macro->DockHasStatusLabel());
} else {
setWindowTitle("<deleted macro>");
}
@ -120,49 +121,52 @@ void MacroDock::EnableHighlight(bool value)
void MacroDock::RunClicked()
{
if (!_macro) {
auto macro = _macro.lock();
if (!macro) {
return;
}
auto ret = _macro->PerformActions(true);
auto ret = macro->PerformActions(true);
if (!ret) {
QString err =
obs_module_text("AdvSceneSwitcher.macroTab.runFail");
DisplayMessage(err.arg(QString::fromStdString(_macro->Name())));
DisplayMessage(err.arg(QString::fromStdString(macro->Name())));
}
}
void MacroDock::PauseToggleClicked()
{
if (!_macro) {
auto macro = _macro.lock();
if (!macro) {
return;
}
_macro->SetPaused(!_macro->Paused());
macro->SetPaused(!macro->Paused());
UpdateText();
}
void MacroDock::UpdateText()
{
_run->setText(_runButtonText.c_str());
if (!_macro) {
auto macro = _macro.lock();
if (!macro) {
return;
}
_pauseToggle->setText(_macro->Paused() ? _unpauseButtonText.c_str()
: _pauseButtonText.c_str());
_statusText->setText(_macro->Matched() ? _conditionsTrueText.c_str()
: _conditionsFalseText.c_str());
_pauseToggle->setText(macro->Paused() ? _unpauseButtonText.c_str()
: _pauseButtonText.c_str());
_statusText->setText(macro->Matched() ? _conditionsTrueText.c_str()
: _conditionsFalseText.c_str());
}
void MacroDock::Highlight()
{
if (!_highlight || !_macro) {
auto macro = _macro.lock();
if (!_highlight || !macro) {
return;
}
if (_lastHighlightCheckTime.time_since_epoch().count() != 0 &&
_macro->ExecutedSince(_lastHighlightCheckTime)) {
macro->ExecutedSince(_lastHighlightCheckTime)) {
PulseWidget(this, Qt::green, QColor(0, 0, 0, 0), true);
}
_lastHighlightCheckTime = std::chrono::high_resolution_clock::now();

5
src/macro-core/macro-dock.hpp
View File

@ -16,7 +16,8 @@ class MacroDock : public OBSDock {
Q_OBJECT
public:
MacroDock(Macro *, QWidget *parent, const StringVariable &runButtonText,
MacroDock(std::weak_ptr<Macro>, QWidget *parent,
const StringVariable &runButtonText,
const StringVariable &pauseButtonText,
const StringVariable &unpauseButtonText,
const StringVariable &conditionsTrueText,
@ -53,7 +54,7 @@ private:
QTimer _timer;
std::chrono::high_resolution_clock::time_point _lastHighlightCheckTime{};
Macro *_macro;
std::weak_ptr<Macro> _macro;
};
} // namespace advss

3
src/macro-core/macro.cpp
View File

@ -806,7 +806,8 @@ void Macro::EnableDock(bool value)
// Create new dock widget
auto window =
static_cast<QMainWindow *>(obs_frontend_get_main_window());
_dock = new MacroDock(this, window, _runButtonText, _pauseButtonText,
_dock = new MacroDock(GetWeakMacroByName(_name.c_str()), window,
_runButtonText, _pauseButtonText,
_unpauseButtonText, _conditionsTrueStatusText,
_conditionsFalseStatusText, _dockHighlight);
SetDockWidgetName(); // Used by OBS to restore position