From 9da5393ce34b3cc31277731db78abfde3f723246 Mon Sep 17 00:00:00 2001 From: brandman211 Date: Thu, 13 Sep 2012 10:26:44 +0000 Subject: [PATCH] -.LSMV: \r is considered off. Empty lines should be ignored. --- BizHawk.MultiClient/movie/MovieImport.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/BizHawk.MultiClient/movie/MovieImport.cs b/BizHawk.MultiClient/movie/MovieImport.cs index 3afd1cf0cf..3885b13ab0 100644 --- a/BizHawk.MultiClient/movie/MovieImport.cs +++ b/BizHawk.MultiClient/movie/MovieImport.cs @@ -171,7 +171,7 @@ namespace BizHawk.MultiClient if (Path.GetExtension(path).ToUpper() == ".LSMV" && sections.Length != 0) { string flags = sections[0]; - char[] off = { '.', ' ', '\t', '\n' }; + char[] off = { '.', ' ', '\t', '\n', '\r' }; if (flags.Length == 0 || off.Contains(flags[0])) { errorMsg = "Subframes are not supported."; @@ -986,6 +986,8 @@ namespace BizHawk.MultiClient string line; while ((line = reader.ReadLine()) != null) { + if (line == "") + continue; m = ImportTextFrame(line, lineNum, m, path, ref warningMsg, ref errorMsg); if (errorMsg != "") {