diff options
| author | Hein-Pieter van Braam <hp@tmm.cx> | 2017-10-03 12:24:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-03 12:24:11 +0200 |
| commit | 2bece6bbd35c53390b2d3eedcf9b6d9949db518d (patch) | |
| tree | aad5340ed55e7727d50d6beb438cc843c78051e2 /platform/javascript/javascript_main.cpp | |
| parent | cc407847286e8033252db8caa382857a5601fbf2 (diff) | |
| parent | 7b23665e728fe10cd0eedb54824aaeae4ae23758 (diff) | |
| download | redot-engine-2bece6bbd35c53390b2d3eedcf9b6d9949db518d.tar.gz | |
Merge pull request #11782 from eska014/persistent-userfs-test
Add OS::is_userfs_persistent, allow starting HTML5 platform in private mode
Diffstat (limited to 'platform/javascript/javascript_main.cpp')
| -rw-r--r-- | platform/javascript/javascript_main.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/platform/javascript/javascript_main.cpp b/platform/javascript/javascript_main.cpp index 4c948bf181..ed4f416cfd 100644 --- a/platform/javascript/javascript_main.cpp +++ b/platform/javascript/javascript_main.cpp @@ -39,8 +39,13 @@ static void main_loop() { os->main_loop_iterate(); } -extern "C" void main_after_fs_sync() { +extern "C" void main_after_fs_sync(char *p_idbfs_err) { + String idbfs_err = String::utf8(p_idbfs_err); + if (!idbfs_err.empty()) { + print_line("IndexedDB not available: " + idbfs_err); + } + os->set_idbfs_available(idbfs_err.empty()); // Ease up compatibility ResourceLoader::set_abort_on_missing_resources(false); Main::start(); @@ -60,14 +65,7 @@ int main(int argc, char *argv[]) { FS.mkdir('/userfs'); FS.mount(IDBFS, {}, '/userfs'); FS.syncfs(true, function(err) { - if (err) { - Module.setStatus('Failed to load persistent data\nPlease allow (third-party) cookies'); - Module.printErr('Failed to populate IDB file system: ' + err.message); - Module.noExitRuntime = false; - } else { - Module.print('Successfully populated IDB file system'); - ccall('main_after_fs_sync', null); - } + Module['ccall']('main_after_fs_sync', null, ['string'], [err ? err.message : ""]) }); ); /* clang-format on */ |