From da5ae02a0686208e9e09817c27a9fd5733f36e73 Mon Sep 17 00:00:00 2001
From: GRL <g.lesniewski@thecodingmachine.com>
Date: Tue, 22 Jun 2021 10:22:49 +0200
Subject: [PATCH] Correction form review and checks

---
 .../InputTextGlobalMessage.svelte             |  6 ++--
 .../UploadAudioGlobalMessage.svelte           | 31 +++++++++----------
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/front/src/Components/ConsoleGlobalMessageManager/InputTextGlobalMessage.svelte b/front/src/Components/ConsoleGlobalMessageManager/InputTextGlobalMessage.svelte
index 3ed0ba7b..f82764d6 100644
--- a/front/src/Components/ConsoleGlobalMessageManager/InputTextGlobalMessage.svelte
+++ b/front/src/Components/ConsoleGlobalMessageManager/InputTextGlobalMessage.svelte
@@ -7,6 +7,7 @@
     import {AdminMessageEventTypes} from "../../Connexion/AdminMessagesService";
     import type {GameScene} from "../../Phaser/Game/GameScene";
     import type {Quill} from "quill";
+    import {LoginSceneName} from "../../Phaser/Login/LoginScene";
 
     //toolbar
     export const toolbarOptions = [
@@ -35,10 +36,7 @@
     export let game: Game;
     export let gameManager: GameManager;
 
-    let gameScene: GameScene;
-    if (gameManager.currentGameSceneName) {
-        gameScene = gameManager.getCurrentGameScene(game.scene.getScene(gameManager.currentGameSceneName));
-    }
+    let gameScene = gameManager.getCurrentGameScene(game.scene.getScene(LoginSceneName));
     let quill: Quill;
     let INPUT_CONSOLE_MESSAGE: HTMLDivElement;
 
diff --git a/front/src/Components/ConsoleGlobalMessageManager/UploadAudioGlobalMessage.svelte b/front/src/Components/ConsoleGlobalMessageManager/UploadAudioGlobalMessage.svelte
index 469cb685..280ec953 100644
--- a/front/src/Components/ConsoleGlobalMessageManager/UploadAudioGlobalMessage.svelte
+++ b/front/src/Components/ConsoleGlobalMessageManager/UploadAudioGlobalMessage.svelte
@@ -6,7 +6,7 @@
     import {AdminMessageEventTypes} from "../../Connexion/AdminMessagesService";
     import type {PlayGlobalMessageInterface} from "../../Connexion/ConnexionModels";
     import uploadFile from "../images/music-file.svg";
-    import type {GameScene} from "../../Phaser/Game/GameScene";
+    import {LoginSceneName} from "../../Phaser/Login/LoginScene";
 
     interface EventTargetFiles extends EventTarget {
         files: Array<File>;
@@ -15,10 +15,7 @@
     export let game: Game;
     export let gameManager: GameManager;
 
-    let gameScene: GameScene;
-    if (gameManager.currentGameSceneName) {
-        gameScene = gameManager.getCurrentGameScene(game.scene.getScene(gameManager.currentGameSceneName));
-    }
+    let gameScene = gameManager.getCurrentGameScene(game.scene.getScene(LoginSceneName));
     let fileinput: HTMLInputElement;
     let filename: string;
     let filesize: string;
@@ -29,24 +26,24 @@
 
     async function SendAudioMessage() {
         const inputAudio = HtmlUtils.getElementByIdOrFail<HTMLInputElement>("input-send-audio");
-            const selectedFile = inputAudio.files ? inputAudio.files[0] : null;
-            if (!selectedFile) {
-                errorfile = true;
-                throw 'no file selected';
-            }
+        const selectedFile = inputAudio.files ? inputAudio.files[0] : null;
+        if (!selectedFile) {
+            errorfile = true;
+            throw 'no file selected';
+        }
 
-            const fd = new FormData();
-            fd.append('file', selectedFile);
-            const res = await gameScene.connection.uploadAudio(fd);
+        const fd = new FormData();
+        fd.append('file', selectedFile);
+        const res = await gameScene.connection.uploadAudio(fd);
 
-            const GlobalMessage: PlayGlobalMessageInterface = {
+        const GlobalMessage: PlayGlobalMessageInterface = {
             id: (res as { id: string }).id,
             message: (res as { path: string }).path,
             type: AUDIO_TYPE
         }
-            inputAudio.value = '';
-            gameScene.connection.emitGlobalMessage(GlobalMessage);
-            disableConsole();
+        inputAudio.value = '';
+        gameScene.connection.emitGlobalMessage(GlobalMessage);
+        disableConsole();
     }
 
     function inputAudioFile(event: Event) {