fix: crash due to font family name is an empty space (#745)

love-linger · love-linger · commit 4fc32b2b59f4 · 2024-11-27T09:17:18.000+08:00
diff --git a/src/ViewModels/Preference.cs b/src/ViewModels/Preference.cs
@@ -65,7 +65,8 @@ public string DefaultFontFamily
             get => _defaultFontFamily;
             set
             {
-                if (SetProperty(ref _defaultFontFamily, value) && !_isLoading)
+                var trimmed = value.Trim();
+                if (SetProperty(ref _defaultFontFamily, trimmed) && !_isLoading)
                     App.SetFonts(_defaultFontFamily, _monospaceFontFamily, _onlyUseMonoFontInEditor);
             }
         }
@@ -75,7 +76,8 @@ public string MonospaceFontFamily
             get => _monospaceFontFamily;
             set
             {
-                if (SetProperty(ref _monospaceFontFamily, value) && !_isLoading)
+                var trimmed = value.Trim();
+                if (SetProperty(ref _monospaceFontFamily, trimmed) && !_isLoading)
                     App.SetFonts(_defaultFontFamily, _monospaceFontFamily, _onlyUseMonoFontInEditor);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,8 @@ public string DefaultFontFamily`
`65`	`65`	`get => _defaultFontFamily;`
`66`	`66`	`set`
`67`	`67`	`{`
`68`		`- if (SetProperty(ref _defaultFontFamily, value) && !_isLoading)`
	`68`	`+ var trimmed = value.Trim();`
	`69`	`+ if (SetProperty(ref _defaultFontFamily, trimmed) && !_isLoading)`
`69`	`70`	`App.SetFonts(_defaultFontFamily, _monospaceFontFamily, _onlyUseMonoFontInEditor);`
`70`	`71`	`}`
`71`	`72`	`}`
`@@ -75,7 +76,8 @@ public string MonospaceFontFamily`
`75`	`76`	`get => _monospaceFontFamily;`
`76`	`77`	`set`
`77`	`78`	`{`
`78`		`- if (SetProperty(ref _monospaceFontFamily, value) && !_isLoading)`
	`79`	`+ var trimmed = value.Trim();`
	`80`	`+ if (SetProperty(ref _monospaceFontFamily, trimmed) && !_isLoading)`
`79`	`81`	`App.SetFonts(_defaultFontFamily, _monospaceFontFamily, _onlyUseMonoFontInEditor);`
`80`	`82`	`}`
`81`	`83`	`}`