fix loader waits too long when project loads superfast

dependencies hashes:
openFrameworks d78075f4bca6be2a2533c6e51a75cc1f18404501
ofxMsdfgen e14da13d02c4dff04fb69d7923469f606924e6c3
ofxGPUFont d482bb7cbdf6b296fa4ab5abcf73fb5ff8c8b239
ofxVariableLab 0b5f9bdebc1e5550621957e73c040c258ec6317b
ofxProfiler a868e34fa1a79189dd4fbdede2938e308535e5e8
theatre 86d3e07f6f2c75fd6e08fca8c97e3617c9e23b18
This commit is contained in:
themancalledjakob 2024-04-01 15:44:26 +02:00
parent 0d732943b3
commit d7ac9e834d
2 changed files with 14 additions and 6 deletions

View file

@ -807,7 +807,11 @@ const Audio = function(tp, record) {
addAudioButton(layer, propTitle, isActive); addAudioButton(layer, propTitle, isActive);
} }
}); });
return props.length > 1 && props[0] !== 'dummy'; const good = props.length > 1 && props[0] !== 'dummy';
if (good) {
this.injectedPanelAtLeastOnce = true;
}
return good;
}; };
const audioSourceCombos = {}; const audioSourceCombos = {};
const readAudioFiles = () => { const readAudioFiles = () => {

View file

@ -330,12 +330,16 @@ const setLoadingDoneHook = () => {
if (!addedListener) { if (!addedListener) {
const panel = tp.getPanel(); const panel = tp.getPanel();
if (panel !== null) { if (panel !== null) {
addedListener = true; if (audio.injectedPanelAtLeastOnce) {
const injectedAll = () => {
window.setLoadingDone(); window.setLoadingDone();
tp.getPanel().removeEventListener('injectedAll', injectedAll); } else {
}; addedListener = true;
tp.getPanel().addEventListener('injectedAll', injectedAll); const injectedAll = () => {
window.setLoadingDone();
tp.getPanel().removeEventListener('injectedAll', injectedAll);
};
tp.getPanel().addEventListener('injectedAll', injectedAll);
}
clearInterval(loadingInjectInterval); clearInterval(loadingInjectInterval);
} }
} }