Fix #67

ghost1372 · May 23, 2021 · 8bd6245 · 8bd6245
1 parent 31c9dae
commit 8bd6245
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/Shared/HandyControl_Shared/HandyControls/DynamicLanguage/LocalizationExtension.cs b/src/Shared/HandyControl_Shared/HandyControls/DynamicLanguage/LocalizationExtension.cs
@@ -122,12 +122,15 @@ public override object ProvideValue(IServiceProvider serviceProvider)
             // if provider is null again, mybe we are in usercontrol so we can use mainwindow provider
             if (ctlProvider == null)
             {
-                object localValue = Application.Current.MainWindow.ReadLocalValue(LocalizationManager.ProviderProperty);
-                if (localValue != DependencyProperty.UnsetValue)
+                if (Application.Current.MainWindow != null)
                 {
-                    if (localValue is ILocalizationProvider provider)
+                    object localValue = Application.Current.MainWindow.ReadLocalValue(LocalizationManager.ProviderProperty);
+                    if (localValue != DependencyProperty.UnsetValue)
                     {
-                        ctlProvider = provider;
+                        if (localValue is ILocalizationProvider provider)
+                        {
+                            ctlProvider = provider;
+                        }
                     }
                 }
             }