Fix logic of checkbox formspec element validity checking

kahrl · kahrl · commit 2ab97a7821e8 · 2015-01-09T16:57:54.000+01:00
diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp
@@ -385,7 +385,7 @@ void GUIFormSpecMenu::parseCheckbox(parserData* data,std::string element)
 {
 	std::vector<std::string> parts = split(element,';');
 
-	if (((parts.size() >= 3) || (parts.size() <= 4)) ||
+	if (((parts.size() >= 3) && (parts.size() <= 4)) ||
 		((parts.size() > 4) && (m_formspec_version > FORMSPEC_API_VERSION)))
 	{
 		std::vector<std::string> v_pos = split(parts[0],',');

Original file line number	Diff line number	Diff line change
`@@ -385,7 +385,7 @@ void GUIFormSpecMenu::parseCheckbox(parserData* data,std::string element)`
`385`	`385`	`{`
`386`	`386`	`std::vector<std::string> parts = split(element,';');`
`387`	`387`
`388`		`- if (((parts.size() >= 3) \|\| (parts.size() <= 4)) \|\|`
	`388`	`+ if (((parts.size() >= 3) && (parts.size() <= 4)) \|\|`
`389`	`389`	`((parts.size() > 4) && (m_formspec_version > FORMSPEC_API_VERSION)))`
`390`	`390`	`{`
`391`	`391`	`std::vector<std::string> v_pos = split(parts[0],',');`