OSDN Git Service
(root)
/
winmerge-jp
/
winmerge-jp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2e1d8c8
)
Fix crash when opening hex view, if frhed is not installed
author
sdottaka
<sdottaka@users.sourceforge.net>
Wed, 11 Feb 2015 08:13:48 +0000
(17:13 +0900)
committer
sdottaka
<sdottaka@users.sourceforge.net>
Wed, 11 Feb 2015 08:13:48 +0000
(17:13 +0900)
--HG--
branch : stable
Src/MainFrm.cpp
patch
|
blob
|
history
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;
}