diff --git a/jenkins/create_build.sh b/jenkins/create_build.sh index 08ef2e3..d96f108 100755 --- a/jenkins/create_build.sh +++ b/jenkins/create_build.sh @@ -122,5 +122,5 @@ function deploy_client() { #install_npm #compile_scripts #compile_native -#package_client -deploy_client +package_client +#deploy_client diff --git a/modules/core/ui-loader/loader.ts b/modules/core/ui-loader/loader.ts index e8e141b..ce5acf8 100644 --- a/modules/core/ui-loader/loader.ts +++ b/modules/core/ui-loader/loader.ts @@ -507,7 +507,7 @@ async function load_cached_or_remote_ui_pack(channel: string, stats_update: (mes } } else if(remote_version.timestamp <= newest_local_version && !ignore_new_version_timestamp) { /* We've already a equal or newer version. Don't use the remote version */ - remote_version_dropped = true; + remote_version_dropped = remote_version.timestamp > bundles_ui.download_timestamp; /* if remote is older than current bundled version its def. not a drop */ } else { /* update is possible because the timestamp is newer than out latest local version */ try { @@ -553,9 +553,9 @@ async function load_cached_or_remote_ui_pack(channel: string, stats_update: (mes if(remote_version_dropped) { /* try again, but this time enforce a remote download */ - await load_cached_or_remote_ui_pack(channel, stats_update, true); + const result = await load_cached_or_remote_ui_pack(channel, stats_update, true); await do_invalidate_versions(); /* new UI pack seems to be successfully loaded */ - return; /* if not succeeded an exception will be thrown */ + return result; /* if not succeeded an exception will be thrown */ } throw "Failed to load any UI pack (local and remote)\nView the console for more details.\n";