[Rezilla-commits] RezillaSource/Rezilla_Src/Application CRezillaApp.cp, 1.156, 1.157

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

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

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

Index: CRezillaApp.cp
===================================================================
RCS file: /cvsroot/rezilla/RezillaSource/Rezilla_Src/Application/CRezillaApp.cp,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -d -r1.156 -r1.157
--- CRezillaApp.cp	18 Nov 2006 06:49:58 -0000	1.156
+++ CRezillaApp.cp	24 Nov 2006 11:52:27 -0000	1.157
@@ -1,7 +1,7 @@
 // ===========================================================================
 // CRezillaApp.cp					
 //                       Created: 2003-04-16 22:13:54
-//             Last modification: 2006-10-05 09:46:55
+//             Last modification: 2006-11-24 11:33:53
 // Author: Bernard Desgraupes
 // e-mail: <bde...@us...>
 // www: <http://rezilla.sourceforge.net/>
@@ -470,6 +470,7 @@
 	void		*ioParam)
 {
 	Boolean		cmdHandled = true;
+	OSErr		error = noErr;
 	
 	if (inCommand == 1324679167) {
 		inCommand = 27;
@@ -532,7 +533,8 @@
 		case cmd_RezCompare: {
 			CRezCompare * theComparator = new CRezCompare(this);
 			ThrowIfNil_(theComparator);
-			if (theComparator->RunRezCompareDialog() == noErr) {
+			error = theComparator->RunRezCompareDialog();
+			if (error == noErr) {
 				if (theComparator->HasDifferences()) {
 					theComparator->DisplayResults();
 				} else {
@@ -542,10 +544,12 @@
 					// when the window is closed).
 					delete theComparator;
 				}
-			} 
+			} else if (error != userCanceledErr) {
+				UMessageDialogs::DescribeError(CFSTR("CompareMapsError"), error);
+			}
 			break;
 		}
-		
+
 		case cmd_Open: {	
 			FSSpec theFileSpec;
 			OSErr error;