frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1430 (#1464)

Browse Source 
* Fix #1430 - ensure all config and sysinfo response are there before reloading the page

* Fix printout

* fix typo

* PriorityMuxer: Remove emit out of QMutableMapIteratorion

* Test - Build aarch64
This commit is contained in:
LordGrey
2022-05-10 22:29:22 +02:00
committed by GitHub
parent 988ea97346
commit 8f65f34247
7 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libsrc/hyperion/PriorityMuxer.cpp
View File

@@ -346,6 +346,7 @@ void PriorityMuxer::updatePriorities()
_activeInputs.contains(0) ? newPriority = 0 : newPriority = PriorityMuxer::LOWEST_PRIORITY;
bool timeTrigger {false};
QMutableMapIterator<int, PriorityMuxer::InputInfo> i(_activeInputs);
while (i.hasNext()) {
i.next();
@@ -387,12 +388,17 @@ void PriorityMuxer::updatePriorities()
)
)
{
emit signalTimeTrigger(); // as signal to prevent Threading issues
timeTrigger = true;
}
}
}
}
if (timeTrigger)
{
emit signalTimeTrigger(); // signal to prevent Threading issues
}
// evaluate, if manual selected priority is still available
if(!_sourceAutoSelectEnabled)
{

2
libsrc/leddevice/LedDevice.cpp
View File

@@ -616,7 +616,7 @@ void LedDevice::setEnableAttempts(int maxEnableRetries, std::chrono::seconds ena
_maxEnableAttempts = maxEnableRetries;
_enableAttemptTimerInterval = enableRetryTimerInterval;
Debug(_log, "Max enable retries: %d, enable retry interval = %llds", _maxEnableAttempts, static_cast<int>(_enableAttemptTimerInterval.count()));
Debug(_log, "Max enable retries: %d, enable retry interval = %llds", _maxEnableAttempts, _enableAttemptTimerInterval.count());
}
void LedDevice::printLedValues(const std::vector<ColorRgb>& ledValues)