[GME-commit] GMESRC/GME/Gme GMEApp.cpp,1.145,1.146

[Log messages of CVS commits]

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

Modified Files:
	GMEApp.cpp 
Log Message:
Failing silently during Open/Create in case of MGX files, because the XML back end component already handled the error.


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: GMEApp.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GMEApp.cpp,v
retrieving revision 1.145
retrieving revision 1.146
diff -C2 -d -r1.145 -r1.146
*** GMEApp.cpp	27 Sep 2007 12:29:02 -0000	1.145
--- GMEApp.cpp	13 Feb 2008 19:03:15 -0000	1.146
***************
*** 1066,1069 ****
--- 1066,1073 ----
  				consoleMessage( inf, MSG_INFO);
  			}
+ 			else if( E_UNKNOWN_STORAGE == hr && conn.Left(5) == "MGX=\"")
+ 			{
+ 				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");
***************
*** 1222,1225 ****
--- 1226,1232 ----
  			AfxMessageBox("ERROR: Some automatic addon components could not start up\n");
  		}
+ 		if( hr == E_UNKNOWN_STORAGE && conn.Left(5) == "MGX=\"") {
+ 			return; // no more exception handler explanatory messages
+ 		}
  	    COMTHROW(hr);
  
***************
*** 1797,1800 ****
--- 1804,1808 ----
  			keep_on = true;
  			file_name = dlg.GetPathName();
+ 			if( CMainFrame::theInstance) CMainFrame::theInstance->m_console.Message( CString( "Importing ") + file_name + "...", 1);
  			COMTHROW(parser->ParseProject(theApp.mgaProject,PutInBstr(dlg.GetPathName())) );