Commit d4239b92 authored by Michael Reeves's avatar Michael Reeves

Clear data in merge data when clearing diff3List

Without this resize events are sometimes sent before the stale
merge list has been removed leading to intermient crashing.
parent 1efd4a49
......@@ -40,6 +40,13 @@ public:
const Diff3LineList* pDiff3LineList,
TotalDiffStatus* pTotalDiffStatus
);
inline void clearMergeList()
{
m_mergeLineList.clear();
m_totalSize = 0;
}
void initActions(KActionCollection* ac);
void reset();
......
......@@ -142,6 +142,8 @@ void KDiff3App::mainInit(TotalDiffStatus* pTotalDiffStatus, bool bLoadFiles, boo
// so painting must be suppressed
if(bGUI) setLockPainting(true);
//insure merge result window never has stale iterators.
if(m_pMergeResultWindow) m_pMergeResultWindow->clearMergeList();
m_diff3LineList.clear();
m_diff3LineVector.clear();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment