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

10
assets/webconfig/js/content_index.js
View File

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