From: Kimmo Varis <kimmov@gmail.com>
Date: Wed, 11 Apr 2007 14:53:36 +0000 (+0000)
Subject: Fix assert caused by my checkin 2007-04-08 Remove couple of useless wrapper functions
X-Git-Tag: 2.16.5~4267
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=12c3f476546c638afc6011568e6d03630de29210;p=winmerge-jp%2Fwinmerge-jp.git

Fix assert caused by my checkin 2007-04-08 Remove couple of useless wrapper functions
---

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)