Fix ASSERT bug for OleInit

diff --git a/Src/Merge.cpp b/Src/Merge.cpp
index f1a5dcb..08bec2b 100644 (file)
--- a/Src/Merge.cpp
+++ b/Src/Merge.cpp
@@ -490,9 +490,3 @@ void SillyTestCrap()
 
 }
 #endif
-
-int CMergeApp::ExitInstance() 
-{
-       ::CoUninitialize();     
-       return CWinApp::ExitInstance();
-}

diff --git a/Src/Merge.h b/Src/Merge.h
index dcaa1bb..313a76c 100644 (file)
--- a/Src/Merge.h
+++ b/Src/Merge.h
@@ -53,7 +53,6 @@ public:
        //{{AFX_VIRTUAL(CMergeApp)
        public:
        virtual BOOL InitInstance();
-       virtual int ExitInstance();
        //}}AFX_VIRTUAL
 
 // Implementation