bug when processing multiple fixed modules

btzy · Jan 4, 2018 · 704f99e · 704f99e
1 parent fb5c8a0
commit 704f99e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,5 @@ x64/
 Autotimetable/Debug/
 Autotimetable/Release/
 Autotimetable/x64/
-Autotimetable/*.exe
+Autotimetable/*.exe
+.vs/
diff --git a/Autotimetable/main.cpp b/Autotimetable/main.cpp
@@ -239,7 +239,7 @@ inline std::tuple<std::string, std::string, std::string> parse_fixed_mod(const s
 		throw std::invalid_argument("Cannot parse fixed mod selection: \"" + fixed_mods_str.substr(begin, end - begin) + "\".");
 	}
 	std::size_t c3 = fixed_mods_str.find(':', c2 + 1);
-	if (c3 != std::string::npos) {
+	if (c3 < end) {
 		throw std::invalid_argument("Cannot parse fixed mod selection: \"" + fixed_mods_str.substr(begin, end - begin) + "\".");
 	}
 	return std::tuple<std::string, std::string, std::string>(fixed_mods_str.substr(begin, c1 - begin), fixed_mods_str.substr(c1 + 1, c2 - (c1 + 1)), fixed_mods_str.substr(c2 + 1, end - (c2 + 1)));

diff --git a/Autotimetable/modules.json b/Autotimetable/modules.json