[commit] r1206 - trunk/GME/Gme

GMESRC Repository Notifications gme-commit at list.isis.vanderbilt.edu
Wed Mar 16 13:20:43 CDT 2011


Author: ksmyth
Date: Wed Mar 16 13:20:43 2011
New Revision: 1206

Log:
Fix bug with project upgrade. Dont tell user about MetaGME2000 being renamed to MetaGME unless theyre trying to open a MetaGME2000

Modified:
   trunk/GME/Gme/GMEApp.cpp

Modified: trunk/GME/Gme/GMEApp.cpp
==============================================================================
--- trunk/GME/Gme/GMEApp.cpp	Thu Mar 10 12:14:00 2011	(r1205)
+++ trunk/GME/Gme/GMEApp.cpp	Wed Mar 16 13:20:43 2011	(r1206)
@@ -1348,12 +1348,14 @@
 					if (AfxMessageBox(msg ,MB_OKCANCEL) == IDOK) {
 						guidpar = true;
 						tryit = true;
+						newparname = parn;
 					}
 				}
 				if(hr == E_MGA_PARADIGM_NOTREG) {
-					msg = "WARNING: Project could not access its paradigm '" + CString(parn) + "'\n" 
-						" (Eg.: In GME3 the MetaGME2000 paradigm was renamed to MetaGME)\n"
-						"Do you want to open it with an other registered paradigm ?";
+					CString msg = "Could not find paradigm paradigm '" + CString(parn);
+					if (CString(parn) == "MetaGME2000")
+						msg += "'\n (In GME3 the MetaGME2000 paradigm was renamed to MetaGME)";
+					msg += "\nDo you want to import with an other registered paradigm ?";
 					if (AfxMessageBox(msg ,MB_OKCANCEL) == IDOK) {
 					
 						CComObjPtr<IMgaLauncher> launcher;
@@ -2046,9 +2048,10 @@
 					char buf[300];
 					if(h2 != S_OK) {
 						ASSERT(h1 != S_OK);
-						CString msg = "Could not find paradigm paradigm '" + CString(paradigm) + "'\n" 
-								" (Eg.: In GME3 the MetaGME2000 paradigm was renamed to MetaGME)\n"
-								"Do you want to import with an other registered paradigm ?";
+						CString msg = "Could not find paradigm paradigm '" + CString(paradigm);
+						if (CString(paradigm) == "MetaGME2000")
+							msg += "'\n (In GME3 the MetaGME2000 paradigm was renamed to MetaGME)";
+						msg += "\nDo you want to import with an other registered paradigm ?";
 						if (AfxMessageBox(msg ,MB_OKCANCEL) == IDOK) {	
 							CComObjPtr<IMgaLauncher> launcher;
 							COMTHROW( launcher.CoCreateInstance(CComBSTR(L"Mga.MgaLauncher")) );


More information about the gme-commit mailing list