[GME-commit] GMESRC/GME/Gme GMEApp.cpp,1.149,1.150

[Log messages of CVS commits]

Update of /project/gme-repository/GMESRC/GME/Gme
In directory escher:/tmp/cvs-serv5940

Modified Files:
	GMEApp.cpp 
Log Message:
.


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: GMEApp.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GMEApp.cpp,v
retrieving revision 1.149
retrieving revision 1.150
diff -C2 -d -r1.149 -r1.150
*** GMEApp.cpp	20 Feb 2008 21:28:43 -0000	1.149
--- GMEApp.cpp	20 Feb 2008 22:07:40 -0000	1.150
***************
*** 1049,1064 ****
  			CComVariant parg;
  			VARIANT_BOOL ro_mode;
! 			if( E_FILEOPEN == hr && conn.Left(5) == "MGX=\"") // multi user project could not be open
! 			{
! 				// MGX="f:\temp\myproj" [VssDatabase = "..."] [VssPath = "..."] connection string implies that
! 				// there must be an .mgx file in that directory
! 				CString inf( "Please check if the project.mgx file is correct in the project directory!");
! 				consoleMessage( inf, MSG_INFO);
! 			}
! 			else if( E_UNKNOWN_STORAGE == hr && conn.Left(5) == "MGX=\"")
  			{
  				CloseProject();
! 				return; // no more exception handler explanatory messages (or QueryProjectInfo calls)
  			}
  			if(S_OK != mgaProject->QueryProjectInfo(PutInBstr(conn), &version, &parn, &parv, &parg, &ro_mode)) {
  				AfxMessageBox("Cannot query project information. Possible cause: missing/corrupt project file or database");
--- 1049,1061 ----
  			CComVariant parg;
  			VARIANT_BOOL ro_mode;
! 			if( conn.Left(5) == "MGX=\"")
  			{
+ 				if( E_FILEOPEN == hr) // multi user project could not be open
+ 					consoleMessage( "Could not open project!", MSG_ERROR);
+ 				else if( E_UNKNOWN_STORAGE == hr) { } // so additional comment in this case
  				CloseProject();
! 				return; // ensures no more exception handlers or explanatory messages (or QueryProjectInfo calls)
  			}
+ 
  			if(S_OK != mgaProject->QueryProjectInfo(PutInBstr(conn), &version, &parn, &parv, &parg, &ro_mode)) {
  				AfxMessageBox("Cannot query project information. Possible cause: missing/corrupt project file or database");