X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=libs%2Fcbi%2Fluasrc%2Fcbi.lua;h=4bed9b0e68ebe81dee74786378c347c02e5dd058;hb=8368432a63567d73101a9ea05f7f862065ba0cff;hp=aea9b485e621e853010b46e885fde7078dbcc2a1;hpb=b9fbed39cae20547106239127468ad0c0a5d9fea;p=project%2Fluci.git

diff --git a/libs/cbi/luasrc/cbi.lua b/libs/cbi/luasrc/cbi.lua
index aea9b485e6..4bed9b0e68 100644
--- a/libs/cbi/luasrc/cbi.lua
+++ b/libs/cbi/luasrc/cbi.lua
@@ -378,13 +378,13 @@ function Map.parse(self, readinput, ...)
 		end
 	end
 
-	if self.proceed then
-		self.state = FORM_PROCEED
-	elseif self:submitstate() then
-		if self.save then
-			self.state = self.changed and FORM_CHANGED or FORM_VALID
-		else
+	if self:submitstate() then
+		if not self.save then
 			self.state = FORM_INVALID
+		elseif self.proceed then
+			self.state = FORM_PROCEED
+		else
+			self.state = self.changed and FORM_CHANGED or FORM_VALID
 		end
 	else
 		self.state = FORM_NODATA