diff --git a/Libraries/UniversalEditor.Core/IO/Reader.cs b/Libraries/UniversalEditor.Core/IO/Reader.cs index 0b23edb5..85d92fe5 100644 --- a/Libraries/UniversalEditor.Core/IO/Reader.cs +++ b/Libraries/UniversalEditor.Core/IO/Reader.cs @@ -1633,9 +1633,13 @@ namespace UniversalEditor.IO return ReadUntil(until, null, null, out rest); } public string ReadUntil(string until, string ignoreBegin, string ignoreEnd) + { + return ReadUntil(new string[] { until }, ignoreBegin, ignoreEnd); + } + public string ReadUntil(string[] until, string ignoreBegin, string ignoreEnd) { string rest = null; - return ReadUntil(new string[] { until }, ignoreBegin, ignoreEnd, out rest); + return ReadUntil(until, ignoreBegin, ignoreEnd, out rest); } public string ReadUntil(string[] until, string ignoreBegin, string ignoreEnd, out string rest) { diff --git a/Plugins/UniversalEditor.Plugins.AniMiku/DataFormats/AniMiku/ExtendedPMD/ExtendedPMDDataFormat.cs b/Plugins/UniversalEditor.Plugins.AniMiku/DataFormats/AniMiku/ExtendedPMD/ExtendedPMDDataFormat.cs index f7c21c62..ff9a9098 100644 --- a/Plugins/UniversalEditor.Plugins.AniMiku/DataFormats/AniMiku/ExtendedPMD/ExtendedPMDDataFormat.cs +++ b/Plugins/UniversalEditor.Plugins.AniMiku/DataFormats/AniMiku/ExtendedPMD/ExtendedPMDDataFormat.cs @@ -61,7 +61,7 @@ namespace UniversalEditor.DataFormats.AniMiku.ExtendedPMD // attempt to load more IO.Reader br = base.Accessor.Reader; if (br.EndOfStream) return; - byte[] datas = br.ReadUntil("END", false); + byte[] datas = br.ReadUntil(Encoding.ASCII.GetBytes("END"), false); PMDExtensionObjectModel pmdo = new PMDExtensionObjectModel(); PMDExtensionDataFormat pmdf = new PMDExtensionDataFormat();