修复跨线程错误
This commit is contained in:
@@ -185,9 +185,12 @@ namespace SpineViewer
|
|||||||
args.Add(line);
|
args.Add(line);
|
||||||
|
|
||||||
if (args.Count > 0)
|
if (args.Count > 0)
|
||||||
|
{
|
||||||
|
Current.Dispatcher.Invoke(() =>
|
||||||
{
|
{
|
||||||
var vm = (MainWindowViewModel)((MainWindow)Current.MainWindow).DataContext;
|
var vm = (MainWindowViewModel)((MainWindow)Current.MainWindow).DataContext;
|
||||||
Current.Dispatcher.Invoke(() => vm.SpineObjectListViewModel.AddSpineObjectFromFileList(args));
|
vm.SpineObjectListViewModel.AddSpineObjectFromFileList(args);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -202,7 +205,6 @@ namespace SpineViewer
|
|||||||
base.OnStartup(e);
|
base.OnStartup(e);
|
||||||
var uiCulture = CultureInfo.CurrentUICulture.Name.ToLowerInvariant();
|
var uiCulture = CultureInfo.CurrentUICulture.Name.ToLowerInvariant();
|
||||||
_logger.Info("Current UI Culture: {0}", uiCulture);
|
_logger.Info("Current UI Culture: {0}", uiCulture);
|
||||||
|
|
||||||
if (uiCulture.StartsWith("zh")) { } // 默认就是中文, 无需操作
|
if (uiCulture.StartsWith("zh")) { } // 默认就是中文, 无需操作
|
||||||
else if (uiCulture.StartsWith("ja")) Language = AppLanguage.JA;
|
else if (uiCulture.StartsWith("ja")) Language = AppLanguage.JA;
|
||||||
else Language = AppLanguage.EN;
|
else Language = AppLanguage.EN;
|
||||||
|
|||||||
Reference in New Issue
Block a user