From: Steven Barth <steven@midlink.org>
Date: Thu, 26 Mar 2009 12:39:43 +0000 (+0000)
Subject: Fix last commit
X-Git-Tag: 0.9.0~562
X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=8368432a63567d73101a9ea05f7f862065ba0cff

Fix last commit
---

diff --git a/libs/cbi/luasrc/cbi.lua b/libs/cbi/luasrc/cbi.lua
index aea9b485e..4bed9b0e6 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