[Winmerge-svn] SF.net SVN: winmerge: [4062] trunk/Src

[<ki...@us...>]

Revision: 4062
          http://svn.sourceforge.net/winmerge/?rev=4062&view=rev
Author:   kimmov
Date:     2007-01-16 12:22:32 -0800 (Tue, 16 Jan 2007)

Log Message:
-----------
Move options function call out of if() (for easier debugging)

Modified Paths:
--------------
    trunk/Src/Changes.txt
    trunk/Src/DirDoc.cpp

Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt	2007-01-16 20:13:21 UTC (rev 4061)
+++ trunk/Src/Changes.txt	2007-01-16 20:22:32 UTC (rev 4062)
@@ -5,6 +5,8 @@
 2007-01-16 Kimmo
  PATCH: [ 1636314 ] Fix limiting to single file compare window
   Src: MainFrm.cpp
+ Move options function call out of if() (for easier debugging)
+  Src: DirDoc.cpp
 
 2007-01-15 Kimmo
  PATCH: [ 1620076 ] Add Bazaar and Mercurial to SourceControl.flt

Modified: trunk/Src/DirDoc.cpp
===================================================================
--- trunk/Src/DirDoc.cpp	2007-01-16 20:13:21 UTC (rev 4061)
+++ trunk/Src/DirDoc.cpp	2007-01-16 20:22:32 UTC (rev 4062)
@@ -613,12 +613,14 @@
  * @brief Obtain a merge doc to display a difference in files.
  * @param [out] pNew Set to TRUE if a new doc is created,
  * and FALSE if an existing one reused.
+ * @return Pointer to CMergeDoc to use (new or existing). 
  */
 CMergeDoc * CDirDoc::GetMergeDocForDiff(BOOL * pNew)
 {
 	CMergeDoc * pMergeDoc = 0;
 	// policy -- use an existing merge doc if available
-	if (!GetOptionsMgr()->GetBool(OPT_MULTIDOC_MERGEDOCS) && !m_MergeDocs.IsEmpty())
+	const BOOL bMultiDocs = GetOptionsMgr()->GetBool(OPT_MULTIDOC_MERGEDOCS);
+	if (!bMultiDocs && !m_MergeDocs.IsEmpty())
 	{
 		*pNew = FALSE;
 		pMergeDoc = m_MergeDocs.GetHead();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.