From ab93349e11001ede429c8bd16a866a6c5e304bd5 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Thu, 17 Feb 2022 16:05:01 +0530
Subject: [PATCH] fix: load langs on boot properly - don't reload in setup
 wizard cause it crashes at times. - will undo the above once fixed

---
 src/components/Controls/LanguageSelector.vue | 8 ++++++--
 src/main.js                                  | 3 +--
 src/pages/SetupWizard/SetupWizard.vue        | 2 +-
 src/utils.js                                 | 6 +++---
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/components/Controls/LanguageSelector.vue b/src/components/Controls/LanguageSelector.vue
index a96cf2d0..25490ec1 100644
--- a/src/components/Controls/LanguageSelector.vue
+++ b/src/components/Controls/LanguageSelector.vue
@@ -2,8 +2,8 @@
   <FormControl
     :df="languageDf"
     :value="value"
-    @change="setLanguageMap"
-    :input-class="'focus:outline-none rounded '+inputClass"
+    @change="(v) => setLanguageMap(v, dontReload)"
+    :input-class="'focus:outline-none rounded ' + inputClass"
   />
 </template>
 <script>
@@ -23,6 +23,10 @@ export default {
       default:
         'bg-gray-100 active:bg-gray-200 focus:bg-gray-200 px-3 py-2 text-base',
     },
+    dontReload: {
+      type: Boolean,
+      default: false,
+    },
   },
   components: { FormControl },
   computed: {
diff --git a/src/main.js b/src/main.js
index 46c47e50..ab68fd4b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -10,11 +10,10 @@ import { IPC_CHANNELS, IPC_MESSAGES } from './messages';
 import router from './router';
 import { outsideClickDirective } from './ui';
 import { setLanguageMap, showToast, stringifyCircular } from './utils';
-
 (async () => {
   const language = config.get('language');
   if (language) {
-    setLanguageMap(language);
+    await setLanguageMap(language);
   }
 
   frappe.isServer = true;
diff --git a/src/pages/SetupWizard/SetupWizard.vue b/src/pages/SetupWizard/SetupWizard.vue
index 546549ea..514b21c2 100644
--- a/src/pages/SetupWizard/SetupWizard.vue
+++ b/src/pages/SetupWizard/SetupWizard.vue
@@ -10,7 +10,7 @@
       </template>
       <template #content>
         <div class="flex flex-col justify-center items-center h-96">
-          <LanguageSelector class="w-40 mt-8" />
+          <LanguageSelector class="w-40 mt-8" :dont-reload="true" />
           <p
             class="text-sm mt-2 hover:underline cursor-pointer text-gray-700"
             @click="openContributingTranslations"
diff --git a/src/utils.js b/src/utils.js
index 27221679..2a53f76a 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -479,7 +479,7 @@ async function fetchAndSetLanguageMap(code) {
   return success;
 }
 
-export async function setLanguageMap(initLanguage) {
+export async function setLanguageMap(initLanguage, dontReload = false) {
   const oldLanguage = config.get('language');
   initLanguage ??= oldLanguage;
   const [code, language, usingDefault] = getLanguageCode(
@@ -498,8 +498,8 @@ export async function setLanguageMap(initLanguage) {
     config.set('language', language);
   }
 
-  if (success && initLanguage !== oldLanguage) {
-    ipcRenderer.send(IPC_MESSAGES.RELOAD_MAIN_WINDOW);
+  if (!dontReload && success && initLanguage !== oldLanguage) {
+    await ipcRenderer.send(IPC_MESSAGES.RELOAD_MAIN_WINDOW);
   }
   return success;
 }