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:
726b144
)
MergeDoc.cpp: clear GGhostTextBuffer::m_RealityBlock when reloading unnamed buffer
author
Takashi Sawanaka
<sdottaka@users.sourceforge.net>
Mon, 12 Nov 2018 16:12:18 +0000
(
01:12
+0900)
committer
Takashi Sawanaka
<sdottaka@users.sourceforge.net>
Mon, 12 Nov 2018 16:12:18 +0000
(
01:12
+0900)
--HG--
branch : stable
Src/MergeDoc.cpp
patch
|
blob
|
history
diff --git
a/Src/MergeDoc.cpp
b/Src/MergeDoc.cpp
index
7dc05fb
..
6b6a227
100644
(file)
--- a/
Src/MergeDoc.cpp
+++ b/
Src/MergeDoc.cpp
@@
-2478,6
+2478,7
@@
DWORD CMergeDoc::LoadOneFile(int index, String filename, bool readOnly, const St
m_nBufferType[index] = BUFFER_UNNAMED;
m_ptBuf[index]->InitNew();
m_ptBuf[index]->m_encoding = encoding;
+ m_ptBuf[index]->FinishLoading(); // should clear GGhostTextBuffer::m_RealityBlock when reloading unnamed buffer
loadSuccess = FileLoadResult::FRESULT_OK;
}
return loadSuccess;