Fix #1430 (#1464)

* 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

Author: Lord-Grey

.github/workflows/pull-request.yml

@@ -59,15 +59,13 @@ jobs:
         run: |
           mkdir -p ${{ matrix.dockerImage }}
           mv deploy/*.tar.gz ${{ matrix.dockerImage }}
-        if: matrix.dockerImage != 'aarch64'
 
       # Upload artifacts
       - name: Upload artifacts
         uses: actions/upload-artifact@v2
         with:
           name: ${{ matrix.dockerImage }}
           path: ${{ matrix.dockerImage }}
-        if: matrix.dockerImage != 'aarch64'
 
 ######################
 ###### macOS #########

assets/webconfig/i18n/en.json

@@ -613,7 +613,7 @@
     "edt_dev_spec_switchOffOnBlack_title": "Switch off on black",
     "edt_dev_spec_switchOffOnbelowMinBrightness_title": "Switch-off, below minimum",
     "edt_dev_spec_syncOverwrite_title": "Disable synchronisation",
-    "edt_dev_spec_targetIpHost_expl": "Hostname (DNS/mDNS) or IP-address (IPv4 orIPv6)",
+    "edt_dev_spec_targetIpHost_expl": "Hostname (DNS/mDNS) or IP-address (IPv4 or IPv6)",
     "edt_dev_spec_targetIpHost_title": "Hostname/IP-address",
     "edt_dev_spec_targetIpHost_title_info": "The device's hostname or IP-address",
     "edt_dev_spec_targetIp_title": "IP-address",

assets/webconfig/js/content_index.js

@@ -214,8 +214,8 @@ $(document).ready(function () {
     requestRequiresAdminAuth();
   });
 
-  $(window.hyperion).one("ready", function (event) {
-    // Content will be loaded by the instance load/switch
+  $(window.hyperion).on("ready", function (event) {
+    loadContent(undefined,true);
 
     //Hide capture menu entries, if no grabbers are available
     if ((window.serverInfo.grabbers.screen.available.length === 0) && (window.serverInfo.grabbers.video.available.length === 0)) {
@@ -283,7 +283,6 @@ $(document).ready(function () {
       requestServerConfig();
       setTimeout(requestServerInfo, 100)
       setTimeout(requestTokenInfo, 200)
-      setTimeout(loadContent, 300, undefined, true)
     }
 
     // determine button visibility
@@ -294,14 +293,14 @@ $(document).ready(function () {
       $('#btn_hypinstanceswitch').toggle(false)
 
     // update listing for button
-    updateHyperionInstanceListing()
+    updateUiOnInstance(currentHyperionInstance);
+    updateHyperionInstanceListing();
   });
 
   $(window.hyperion).on("cmd-instance-switchTo", function (event) {
     requestServerConfig();
     setTimeout(requestServerInfo, 200)
     setTimeout(requestTokenInfo, 400)
-    setTimeout(loadContent, 400, undefined, true)
   });
 
   $(window.hyperion).on("cmd-effects-update", function (event) {
@@ -386,4 +385,3 @@ function SwitchToMenuItem(target, item) {
   }
 };
 
-

assets/webconfig/js/ui_utils.js

@@ -190,7 +190,6 @@ function instanceSwitch(inst) {
   window.currentHyperionInstance = inst;
   window.currentHyperionInstanceName = getInstanceNameByIndex(inst);
   setStorage('lastSelectedInstance', inst)
-  updateHyperionInstanceListing()
 }
 
 function loadContentTo(containerId, fileName) {
@@ -1334,3 +1333,4 @@ function isValidHostnameOrIP4(value) {
 function isValidHostnameOrIP(value) {
   return (isValidHostnameOrIP4(value) || isValidIPv6(value) || isValidServicename(value));
 }
+

include/hyperion/BGEffectHandler.h

@@ -103,7 +103,7 @@ private slots:
 		}
 		else if (_prioMuxer->getCurrentPriority() == PriorityMuxer::LOWEST_PRIORITY && _isBgEffectConfigured)
 		{
-			Debug(Logger::getInstance("HYPERION"),"Start background (color-) effect as it moved is scope");
+			Debug(Logger::getInstance("HYPERION"),"Start background (color-) effect as it moved in scope");
 			emit handleSettingsUpdate (settings::BGEFFECT, _bgEffectConfig);
 		}
 	}

libsrc/hyperion/PriorityMuxer.cpp

@@ -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)
 	{

libsrc/leddevice/LedDevice.cpp

@@ -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)