[Rezilla-commits] RezillaSource/Rezilla_Src/Rez CRezCompare.cp, 1.30, 1.31

[Bernard D. <bde...@us...>]

Update of /cvsroot/rezilla/RezillaSource/Rezilla_Src/Rez
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10003

Modified Files:
	CRezCompare.cp 
Log Message:
Compare map error msg

Index: CRezCompare.cp
===================================================================
RCS file: /cvsroot/rezilla/RezillaSource/Rezilla_Src/Rez/CRezCompare.cp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- CRezCompare.cp	18 Nov 2006 06:54:35 -0000	1.30
+++ CRezCompare.cp	24 Nov 2006 11:53:29 -0000	1.31
@@ -211,9 +211,11 @@
 				if ( !theOldPath[0] || !theNewPath[0] ) {
 					UMessageDialogs::SimpleMessageFromLocalizable(CFSTR("MapsNotSelected"), PPob_SimpleMessage);
 				} else {
+					inRezCompLoop = false;
 					break;
 				}
 			} else if (msg_Cancel == theMessage) {
+				error = userCanceledErr;
 				inRezCompLoop = false;
 				break;
 			} else if (msg_RezCompSetOld == theMessage || msg_RezCompSetNew == theMessage) {
@@ -263,11 +265,10 @@
 				// Execute a comparison
 				DoCompareRezMaps();
 				// Now get out of the outer 'while'
-				inRezCompLoop = false;
+			} else {
+				error = err_InvalidMapForComparison;
 			}
-		} else {
-			error = userCanceledErr;
-		}
+		} 
 	}
 	return error;
 }