fix: uncaught exceptions from language change callbacks stop subseque…

…nt callbacks
bdunderscore · Dec 29, 2023 · 07fad0c · 07fad0c
1 parent 02b58c1
commit 07fad0c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - API to record when one object is replaced by another
 
 ### Fixed
+- Exceptions leaking out of language change callbacks break subsequent callbacks (#103)
+- Deregistering a language change callback while callbacks are running could skip executing some callbacks (#103)
 
 ### Changed
 

diff --git a/Editor/UI/Localization/LanguagePrefs.cs b/Editor/UI/Localization/LanguagePrefs.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Runtime.CompilerServices;
+using UnityEngine;
 
 namespace nadena.dev.ndmf.localization
 {
@@ -84,7 +85,14 @@ private static void TriggerLanguageChangeCallbacks()
             {
                 foreach (Action op in new List<Action>(_onLanguageChangeCallbacks))
                 {
-                    op();
+                    try
+                    {
+                        op();
+                    }
+                    catch (Exception e)
+                    {
+                        Debug.LogException(e);
+                    }
                 }
             }
         }