[commit] r1403 - trunk/GME/Gme

Fri Jul 15 12:49:49 CDT 2011

Author: ksmyth
Date: Fri Jul 15 12:49:49 2011
New Revision: 1403

Log:
Move calling clearGmeOleApp() from OnClose to OnNcDestroy, since OnClose can be vetoed. Fixes GME-298

Modified:
   trunk/GME/Gme/MainFrm.cpp
   trunk/GME/Gme/MainFrm.h

Modified: trunk/GME/Gme/MainFrm.cpp
==============================================================================

--- trunk/GME/Gme/MainFrm.cpp	Fri Jul 15 09:04:00 2011	(r1402)
+++ trunk/GME/Gme/MainFrm.cpp	Fri Jul 15 12:49:49 2011	(r1403)
@@ -220,11 +220,10 @@
 	m_console.SetGMEProj( 0 );
 }
 
-
-void CMainFrame::OnClose()
+void CMainFrame::OnNcDestroy()
 {
 	clearGmeOleApp();
-	CMDIFrameWndEx::OnClose();
+	CMDIFrameWndEx::OnNcDestroy();
 }
 
 int CMainFrame::CreateToolBars()

Modified: trunk/GME/Gme/MainFrm.h
==============================================================================
--- trunk/GME/Gme/MainFrm.h	Fri Jul 15 09:04:00 2011	(r1402)
+++ trunk/GME/Gme/MainFrm.h	Fri Jul 15 12:49:49 2011	(r1403)
@@ -147,7 +147,7 @@
 	}
 
 	afx_msg void OnUpdateWindowNew(CCmdUI* pCmdUI);
-	afx_msg void OnClose();
+	afx_msg void OnNcDestroy();
 public:
 	afx_msg void OnDropFiles(HDROP p_hDropInfo);
 protected:
