Merge pull request #954 from maiko3tattun/1127_FixPreference

Improved stability of preferences
stakira · Nov 30, 2023 · 47ccf84 · 47ccf84
2 parents 7342b1b + 7bd415c
commit 47ccf84
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 3 deletions.
diff --git a/OpenUtau.Core/Util/Onnx.cs b/OpenUtau.Core/Util/Onnx.cs
@@ -63,7 +63,7 @@ private static SessionOptions getOnnxSessionOptions(){
             if (String.IsNullOrEmpty(runner)) {
                 runner = runnerOptions[0];
             }
-            if (!(runnerOptions.Contains(runner))) {
+            if (!runnerOptions.Contains(runner)) {
                 runner = "cpu";
             }
             switch(runner){

diff --git a/OpenUtau.Core/Util/Preferences.cs b/OpenUtau.Core/Util/Preferences.cs
@@ -1,8 +1,10 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.Text;
 using Newtonsoft.Json;
+using OpenUtau.Core.Render;
 using Serilog;
 
 namespace OpenUtau.Core.Util {
@@ -87,6 +89,15 @@ private static void Load() {
                 if (File.Exists(PathManager.Inst.PrefsFilePath)) {
                     Default = JsonConvert.DeserializeObject<SerializablePreferences>(
                         File.ReadAllText(PathManager.Inst.PrefsFilePath, Encoding.UTF8));
+                    if(Default == null) {
+                        Reset();
+                        return;
+                    }
+
+                    if (!ValidString(new Action(() => CultureInfo.GetCultureInfo(Default.Language)))) Default.Language = string.Empty;
+                    if (!ValidString(new Action(() => CultureInfo.GetCultureInfo(Default.SortingOrder)))) Default.SortingOrder = string.Empty;
+                    if (!Renderers.getRendererOptions().Contains(Default.DefaultRenderer)) Default.DefaultRenderer = string.Empty;
+                    if (!Onnx.getRunnerOptions().Contains(Default.OnnxRunner)) Default.OnnxRunner = string.Empty;
                 } else {
                     Reset();
                 }
@@ -96,6 +107,15 @@ private static void Load() {
             }
         }
 
+        private static bool ValidString(Action action) {
+            try {
+                action();
+                return true;
+            } catch {
+                return false;
+            }
+        }
+
         [Serializable]
         public class SerializablePreferences {
             public const int MidiWidth = 1024;

diff --git a/OpenUtau/ViewModels/PreferencesViewModel.cs b/OpenUtau/ViewModels/PreferencesViewModel.cs
@@ -27,7 +27,7 @@ public AudioOutputDevice? AudioOutputDevice {
         [Reactive] public int PlaybackAutoScroll { get; set; }
         [Reactive] public double PlayPosMarkerMargin { get; set; }
         [Reactive] public int LockStartTime { get; set; }
-        public string AdditionalSingersPath => PathManager.Inst.AdditionalSingersPath;
+        public string AdditionalSingersPath => !string.IsNullOrWhiteSpace(PathManager.Inst.AdditionalSingersPath)? PathManager.Inst.AdditionalSingersPath : "(None)";
         [Reactive] public bool InstallToAdditionalSingersPath { get; set; }
         [Reactive] public bool PreRender { get; set; }
         public List<string> DefaultRendererOptions { get; set; }

diff --git a/OpenUtau/Views/MainWindow.axaml.cs b/OpenUtau/Views/MainWindow.axaml.cs
@@ -539,8 +539,17 @@ async void OnMenuInstallSinger(object sender, RoutedEventArgs args) {
         }
 
         void OnMenuPreferences(object sender, RoutedEventArgs args) {
+            PreferencesViewModel dataContext;
+            try {
+                dataContext = new PreferencesViewModel();
+            } catch (Exception e) {
+                Log.Error(e, "Failed to load prefs. Initialize it.");
+                MessageBox.ShowError(this, e);
+                Preferences.Reset();
+                dataContext = new PreferencesViewModel();
+            }
             var dialog = new PreferencesDialog() {
-                DataContext = new PreferencesViewModel(),
+                DataContext = dataContext
             };
             dialog.ShowDialog(this);
             if (dialog.Position.Y < 0) {