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

Enable getting variable values from date condition

Browse Source
This commit is contained in:
WarmUpTill
2023-01-14 18:58:57 +01:00
committed by WarmUpTill
parent 23e2fb8d5a
commit 87ed11d3bf
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,6 +59,7 @@ static std::map<MacroConditionDate::Day, std::string> dayOfWeekNames = {
bool MacroConditionDate::CheckDayOfWeek(int64_t msSinceLastCheck)
{
QDateTime cur = QDateTime::currentDateTime();
SetVariableValue(cur.toString().toStdString());
if (_dayOfWeek != Day::ANY &&
cur.date().dayOfWeek() != static_cast<int>(_dayOfWeek)) {
return false;
@@ -131,6 +132,8 @@ bool MacroConditionDate::CheckRegularDate(int64_t msSinceLastCheck)
{
bool match = false;
QDateTime cur = QDateTime::currentDateTime();
SetVariableValue(cur.toString().toStdString());
if (_ignoreDate) {
_dateTime.setDate(cur.date());
_dateTime2.setDate(cur.date());

2
src/macro-core/macro-condition-date.hpp
View File

@@ -9,7 +9,7 @@
class MacroConditionDate : public MacroCondition {
public:
MacroConditionDate(Macro *m) : MacroCondition(m) {}
MacroConditionDate(Macro *m) : MacroCondition(m, true) {}
bool CheckCondition();
bool Save(obs_data_t *obj) const;
bool Load(obs_data_t *obj);