Insert locks

MicrosoftTranslator · Mar 27, 2021 · 47579b6 · 47579b6
1 parent 385ecad
commit 47579b6
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -45,3 +45,4 @@ TranslationAssistant.DocumentTranslationInterface/bin/Release/FileTranslator.vsh
 /OpenXmlPowerTools/bin/Debug
 /.vs/Microsoft.DocumentTranslator/DesignTimeBuild
 .vs/
+.vs/slnx.sqlite
diff --git a/TranslationAssistant.DocumentTranslationInterface/ViewModel/DocumentTranslation.cs b/TranslationAssistant.DocumentTranslationInterface/ViewModel/DocumentTranslation.cs
@@ -526,7 +526,10 @@ public void PopulateAvailableLanguages()
             if (!TranslationServiceFacade.UseCustomEndpoint) this.sourceLanguageList.Add(Properties.Resources.Common_AutoDetect);
             try
             {
-                this.targetLanguageList.AddRange(TranslationServiceFacade.AvailableLanguages.Values);
+                lock (TranslationServiceFacade.AvailableLanguages)
+                {
+                    this.targetLanguageList.AddRange(TranslationServiceFacade.AvailableLanguages.Values);
+                }
             }
             catch (Exception ex) {
                 this.StatusText = String.Format("{0}\n{1}", Properties.Resources.Error_LanguageList, ex.Message);

diff --git a/TranslationServices.Core/TranslationServiceFacade.cs b/TranslationServices.Core/TranslationServiceFacade.cs
@@ -371,7 +371,10 @@ public static async Task GetLanguages(string AcceptLanguage = "en")
         /// <param name="AcceptLanguage">Accept-Language</param>
         private static async Task GetLanguagesInternal(string AcceptLanguage = "en")
         {
-            AvailableLanguages.Clear();
+            lock (AvailableLanguages)
+            { 
+                AvailableLanguages.Clear();
+            }
             if (UseCustomEndpoint)
             {
                 ContainerGetLanguages();
@@ -390,17 +393,21 @@ private static async Task GetLanguagesInternal(string AcceptLanguage = "en")
                 request.Headers.Add("Accept-Language", AcceptLanguage);
                 HttpResponseMessage response = await client.SendAsync(request).ConfigureAwait(false);
                 string jsonResponse = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
-                if (response.StatusCode == System.Net.HttpStatusCode.OK)
+                lock (AvailableLanguages)
                 {
-                    var result = JsonConvert.DeserializeObject<Dictionary<string, Dictionary<string, Dictionary<string, string>>>>(jsonResponse);
-                    var languages = result["translation"];
-
-                    string[] languagecodes = languages.Keys.ToArray();
-                    foreach (var kv in languages)
+                    if (response.StatusCode == System.Net.HttpStatusCode.OK)
                     {
-                        AvailableLanguages.Add(kv.Key, kv.Value["name"]);
+                        var result = JsonConvert.DeserializeObject<Dictionary<string, Dictionary<string, Dictionary<string, string>>>>(jsonResponse);
+                        var languages = result["translation"];
+
+                        string[] languagecodes = languages.Keys.ToArray();
+                        foreach (var kv in languages)
+                        {
+                            AvailableLanguages.Add(kv.Key, kv.Value["name"]);
+                        }
                     }
                 }
+                Debug.Assert(AvailableLanguages.Count > 0, "GetLanguagesInternal: Zero languages.");
             }
             catch (HttpRequestException)
             {