[commit] r1879 - trunk/GME/Console

[GMESRC Repository Notifications]

Author: ksmyth
Date: Fri Mar 23 16:40:51 2012
New Revision: 1879

Log:
Dont crash if user clicks on file:///folder link

Modified:
   trunk/GME/Console/ConsoleCtl.cpp

Modified: trunk/GME/Console/ConsoleCtl.cpp
==============================================================================
--- trunk/GME/Console/ConsoleCtl.cpp	Fri Mar 23 10:32:04 2012	(r1878)
+++ trunk/GME/Console/ConsoleCtl.cpp	Fri Mar 23 16:40:51 2012	(r1879)
@@ -886,10 +886,12 @@
 
 HRESULT CConsoleCtrl::AddGMEToScript()
 {
+	COMTRY {
 	HRESULT hr;
 
 	CComPtr<IHTMLDocument2> pHtmlDoc;
 	CComPtr<IDispatch> pDispatch = m_browser.GetHtmlDocument();
+	// This QI fails on Win7 if the link is to file:///folder
 	COMTHROW(pDispatch.QueryInterface(&pHtmlDoc));
 
 	CComPtr<IDispatch> script;
@@ -921,5 +923,6 @@
 	params.rgdispidNamedArgs = &dispIdPut;
 			
 	return scriptex->InvokeEx(dispIdThis, LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYPUT, &params, NULL, &ei, NULL);
+	} COMCATCH(;)
 }