From 330e6c09e7d8321ca268147de4a6490331d92bc0 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 18 Sep 2025 18:07:18 +0800
Subject: [PATCH] Add language change lock

---
 .../Resource/Internationalization.cs          | 32 ++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/Flow.Launcher.Core/Resource/Internationalization.cs b/Flow.Launcher.Core/Resource/Internationalization.cs
index 6df2a28c6..c1fa2ea16 100644
--- a/Flow.Launcher.Core/Resource/Internationalization.cs
+++ b/Flow.Launcher.Core/Resource/Internationalization.cs
@@ -30,6 +30,7 @@ namespace Flow.Launcher.Core.Resource
         private readonly List<string> _languageDirectories = [];
         private readonly List<ResourceDictionary> _oldResources = [];
         private static string SystemLanguageCode;
+        private readonly SemaphoreSlim _langChangeLock = new(1, 1);
 
         public Internationalization(Settings settings)
         {
@@ -185,20 +186,29 @@ namespace Flow.Launcher.Core.Resource
 
         private async Task ChangeLanguageAsync(Language language, bool updateMetadata = true)
         {
-            // Remove old language files and load language
-            RemoveOldLanguageFiles();
-            if (language != AvailableLanguages.English)
+            await _langChangeLock.WaitAsync();
+
+            try
             {
-                LoadLanguage(language);
+                // Remove old language files and load language
+                RemoveOldLanguageFiles();
+                if (language != AvailableLanguages.English)
+                {
+                    LoadLanguage(language);
+                }
+
+                // Change culture info
+                ChangeCultureInfo(language.LanguageCode);
+
+                if (updateMetadata)
+                {
+                    // Raise event for plugins after culture is set
+                    await Task.Run(UpdatePluginMetadataTranslations);
+                }
             }
-
-            // Change culture info
-            ChangeCultureInfo(language.LanguageCode);
-
-            if (updateMetadata)
+            finally
             {
-                // Raise event for plugins after culture is set
-                await Task.Run(UpdatePluginMetadataTranslations);
+                _langChangeLock.Release();
             }
         }