From 238b6fa13212e923dfa7f0584266e8941bc754b8 Mon Sep 17 00:00:00 2001
From: Observer KRypt0n_ <suimin.tu.mu.ga.mi@gmail.com>
Date: Tue, 22 Feb 2022 18:18:57 +0200
Subject: [PATCH] 2.2.0 - fixed issue with the first launcher run   before the
 Chinese version was loading ignoring config server property

---
 README.md                |  6 +++---
 src/index.svelte         |  9 ++-------
 src/sass/index.sass      |  2 +-
 src/ts/launcher/State.ts | 14 ++++++++++++++
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 45589f1..ffcb28b 100644
--- a/README.md
+++ b/README.md
@@ -62,7 +62,7 @@ field in your `config.yaml` file (settings -> launcher folder). If your system u
 
 | Game version | Launcher version | Patch version |
 | :---: | :---: | :---: |
-| 2.5.0 | 2.1.5 | 2.5.0 stable ✅ |
+| 2.5.0 | 2.2.0 | 2.5.0 stable ✅ |
 
 We have our own [An Anime Game](https://discord.gg/ck37X6UWBp) discord server where you can ask any questions
 
@@ -169,8 +169,8 @@ This is our current roadmap goals. You can find older ones [here](repository/pag
 * <s>ToS Violation Window</s> *(2.1.0)*
 * <s>Add `latest.log` file generation</s> *(2.1.2)*
 * <s>Add an option to show terminal with the wine's log of the game</s> *(7375c743, released in 2.1.3)*
-* <s>Add analytics window</s> *(e0a09323)*
-* <s>Add Chinese game's version support (due to changes in the Krock's patch)</s> *(75f2ad66)*
+* <s>Add analytics window</s> *(e0a09323, released in 2.2.0)*
+* <s>Add Chinese game's version support (due to changes in the Krock's patch)</s> *(75f2ad66, released in 2.2.0)*
 * Implement manual config flushing functionality from the Empathize's API
 * Game statistics window
 * Dark progress bar design
diff --git a/src/index.svelte b/src/index.svelte
index 0dfe840..cc66b65 100644
--- a/src/index.svelte
+++ b/src/index.svelte
@@ -11,7 +11,6 @@
     import Launcher from './ts/Launcher';
     import constants from './ts/Constants';
     import Game from './ts/Game';
-    import Background from './ts/launcher/Background';
 
     import GearIcon from './assets/images/gear.png';
     import GearActiveIcon from './assets/images/gear-active.png';
@@ -117,9 +116,7 @@
 </script>
 
 <main>
-    {#await Background.get() then uri}
-        <img class="background" src={uri} alt="">
-    {/await}
+    <img id="background" src="" alt="">
 
     <div class="downloader-panel" data-theme="light">
         <div class="downloader-label">
@@ -134,9 +131,7 @@
     </div>
 
     <div id="launcher-content">
-        {#await launcher.getSocial() then uri}
-            <iframe id="social-iframe" src={uri} title="" scrolling="no" style="position: absolute; border: 0; top: 0; left: 0;" width="100%" height="100%"></iframe>
-        {/await}
+        <iframe id="social-iframe" src="" title="" scrolling="no" style="position: absolute; border: 0; top: 0; left: 0;" width="100%" height="100%"></iframe>
     </div>
 
     <div id="settings">
diff --git a/src/sass/index.sass b/src/sass/index.sass
index c1b9e5f..8885ad6 100644
--- a/src/sass/index.sass
+++ b/src/sass/index.sass
@@ -1,6 +1,6 @@
 @import "basic"
 
-img.background
+#background
     position: absolute
     
     width: 100%
diff --git a/src/ts/launcher/State.ts b/src/ts/launcher/State.ts
index ed0f523..6e850c0 100644
--- a/src/ts/launcher/State.ts
+++ b/src/ts/launcher/State.ts
@@ -17,6 +17,7 @@ import DXVK from '../core/DXVK';
 import Locales from './Locales';
 import Git from '../core/Git';
 import constants from '../Constants';
+import Background from './Background';
 
 declare const Neutralino;
 
@@ -24,6 +25,9 @@ export default class State
 {
     public launcher: Launcher;
 
+    public backgroundImage: HTMLElement;
+    public socialsIframe: HTMLElement;
+
     public launchButton: HTMLElement;
     public pauseButton: HTMLElement;
     public predownloadButton: HTMLElement;
@@ -53,11 +57,21 @@ export default class State
     {
         this.launcher = launcher;
 
+        this.backgroundImage = <HTMLElement>document.getElementById('background');
+        this.socialsIframe = <HTMLElement>document.getElementById('social-iframe');
+
         this.launchButton = <HTMLElement>document.getElementById('launch');
         this.pauseButton = <HTMLElement>document.getElementById('pause');
         this.predownloadButton = <HTMLElement>document.getElementById('predownload');
         this.settingsButton = <HTMLElement>document.getElementById('settings');
 
+        Background.get().then((uri) => {
+            if (uri)
+                this.backgroundImage.setAttribute('src', uri);
+        });
+
+        launcher.getSocial().then((uri) => this.socialsIframe.setAttribute('src', uri));
+
         this.launchButton.onclick = () => {
             if (this.events[this._state])
             {