diff options
Diffstat (limited to 'src/plugins/platforms/wasm/qtloader.js')
| -rw-r--r-- | src/plugins/platforms/wasm/qtloader.js | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/plugins/platforms/wasm/qtloader.js b/src/plugins/platforms/wasm/qtloader.js index 176d0ce4d7..25e4707c56 100644 --- a/src/plugins/platforms/wasm/qtloader.js +++ b/src/plugins/platforms/wasm/qtloader.js @@ -105,6 +105,12 @@ async function qtLoad(config) config.qtFontDpi = config.qt.fontDpi; delete config.qt.fontDpi; + // Make Emscripten not call main(); this gives us more control over + // the startup sequence. + const originalNoInitialRun = config.noInitialRun; + const originalArguments = config.arguments; + config.noInitialRun = true; + // Used for rejecting a failed load's promise where emscripten itself does not allow it, // like in instantiateWasm below. This allows us to throw in case of a load error instead of // hanging on a promise to entry function, which emscripten unfortunately does. @@ -219,7 +225,18 @@ async function qtLoad(config) try { instance = await Promise.race( [circuitBreaker, config.qt.entryFunction(config)]); + + // Call main after creating the instance. We've opted into manually + // calling main() by setting noInitialRun in the config. Thie Works around + // issue where Emscripten suppresses all exceptions thrown during main. + if (!originalNoInitialRun) + instance.callMain(originalArguments); } catch (e) { + // If this is the exception thrown by app.exec() then that is a normal + // case and we suppress it. + if (e == "unwind") // not much to go on + return; + if (!onExitCalled) { onExitCalled = true; config.qt.onExit?.({ |