Fix crash when opening hex view, if frhed is not installed

--HG--
branch : stable

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index 1474ecd..9ffff10 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -1560,8 +1560,11 @@ DocClass * GetMergeDocForDiff(CMultiDocTemplate *pTemplate, CDirDoc *pDirDoc, in
        // Create a new merge doc
        DocClass::m_nBuffersTemp = nFiles;
        DocClass *pMergeDoc = (DocClass*)pTemplate->OpenDocumentFile(NULL);
-       pDirDoc->AddMergeDoc(pMergeDoc);
-       pMergeDoc->SetDirDoc(pDirDoc);
+       if (pMergeDoc)
+       {
+               pDirDoc->AddMergeDoc(pMergeDoc);
+               pMergeDoc->SetDirDoc(pDirDoc);
+       }
        return pMergeDoc;
 }