From 12c3f476546c638afc6011568e6d03630de29210 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Wed, 11 Apr 2007 14:53:36 +0000 Subject: [PATCH] Fix assert caused by my checkin 2007-04-08 Remove couple of useless wrapper functions --- Src/Changes.txt | 4 ++++ Src/MergeDoc.cpp | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Src/Changes.txt b/Src/Changes.txt index 4ef184dbf..876bfa761 100644 --- a/Src/Changes.txt +++ b/Src/Changes.txt @@ -2,6 +2,10 @@ Src\Changes.txt Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2007-04-11 Kimmo + Fix assert caused by my checkin 2007-04-08 Remove couple of useless wrapper functions + Src: MergeDoc.cpp + 2007-04-11 Gal PATCH: [ 1697691 ] Syntax highlighting scheme as resource strings Src/Languages/*: Merge*.rc diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp index 8b10a482e..2b70d343f 100644 --- a/Src/MergeDoc.cpp +++ b/Src/MergeDoc.cpp @@ -3194,8 +3194,8 @@ void CMergeDoc::UpdateResources() // Return current word breaking break type setting (whitespace only or include punctuation) bool CMergeDoc::GetBreakType() const { - BOOL breakType = GetOptionsMgr()->GetBool(OPT_BREAK_TYPE); - return !!breakType; + BOOL breakType = GetOptionsMgr()->GetInt(OPT_BREAK_TYPE); + return breakType > 0; } // Return true to do line diff colors at the byte level (false to do them at word level) -- 2.11.0