Skip to content

Commit 61ec78b

Browse files
authored
Merge pull request #966 from maiko3tattun/1202_FixLoadOto
Fix #Charaset
2 parents d432a1f + 53b06e2 commit 61ec78b

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

OpenUtau.Core/Classic/VoicebankLoader.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,15 @@ public static OtoSet ParseOtoSet(Stream stream, string filePath, Encoding encodi
341341
};
342342
while (!reader.EndOfStream) {
343343
var line = reader.ReadLine().Trim();
344+
if (line.StartsWith("#Charaset:")) {
345+
try {
346+
var charaset = Encoding.GetEncoding(line.Replace("#Charaset:", ""));
347+
if (encoding != charaset) {
348+
stream.Position = 0;
349+
return ParseOtoSet(stream, filePath, charaset);
350+
}
351+
} catch { }
352+
}
344353
trace.line = line;
345354
try {
346355
Oto oto = ParseOto(line, trace);

0 commit comments

Comments
 (0)