Fix to properly initialize OLE for Crystal Edit drag and drop

diff --git a/Src/Merge.cpp b/Src/Merge.cpp
index d387e4a..4aad870 100644 (file)
--- a/Src/Merge.cpp
+++ b/Src/Merge.cpp
@@ -90,7 +90,11 @@ BOOL CMergeApp::InitInstance()
        SillyTestCrap();
 #endif
 
-       ::CoInitialize(NULL);
+       // CCrystalEdit Drag and Drop functionality needs AfxOleInit.
+       if(!AfxOleInit())
+       {
+               TRACE(_T("AfxOleInitFailed. OLE functionality disabled"));
+       }
 
        // CG: The following block was added by the Splash Screen component.
        {