Merge pull request #875 from maiko3tattun/1008_FixMapImport

Fix import/export prefixmap
stakira · Oct 10, 2023 · a57ae2c · a57ae2c
2 parents 6897d0e + 9c8d168
commit a57ae2c
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/OpenUtau/Views/EditSubbanksDialog.axaml.cs b/OpenUtau/Views/EditSubbanksDialog.axaml.cs
@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using System.Linq;
-using System.Text;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using OpenUtau.App.ViewModels;
@@ -70,7 +69,7 @@ async void OnImportMap(object sender, RoutedEventArgs args) {
             var file = await FilePicker.OpenFile(this, "singers.subbanks.import", ViewModel.Singer.Location, FilePicker.PrefixMap);
             if (!string.IsNullOrEmpty(file)) {
                 try {
-                    using (var reader = new StreamReader(file, Encoding.GetEncoding("shift_jis"))) {
+                    using (var reader = new StreamReader(file, ViewModel.Singer.TextFileEncoding)) {
                         while (reader.Peek() != -1) {
                             var line = reader.ReadLine()!.Trim();
                             var s = line.Split('\t');
@@ -97,7 +96,7 @@ async void OnExportMap(object sender, RoutedEventArgs args) {
                 var file = await FilePicker.SaveFile(this, "singers.subbanks.export", ViewModel.Singer.Location, "prefix.map", FilePicker.PrefixMap);
                 if (!string.IsNullOrEmpty(file)) {
                     try {
-                        using (var writer = new StreamWriter(file, false, Encoding.GetEncoding("shift_jis"))) {
+                        using (var writer = new StreamWriter(file, false, ViewModel.Singer.TextFileEncoding)) {
                             foreach (var row in main.Rows) {
                                 writer.WriteLine($"{row.Tone}\t{row.Prefix}\t{row.Suffix}");
                             }