[Winmerge-svn] SF.net SVN: winmerge:[7141] trunk/Src/MergeEditView.cpp

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

Revision: 7141
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7141&view=rev
Author:   kimmov
Date:     2010-04-28 16:11:09 +0000 (Wed, 28 Apr 2010)

Log Message:
-----------
PATCH: #2933033 No prediffer by menu
 Submitted by Matthias Mayer

Modified Paths:
--------------
    trunk/Src/MergeEditView.cpp

Modified: trunk/Src/MergeEditView.cpp
===================================================================
--- trunk/Src/MergeEditView.cpp	2010-04-27 19:44:53 UTC (rev 7140)
+++ trunk/Src/MergeEditView.cpp	2010-04-28 16:11:09 UTC (rev 7141)
@@ -2462,7 +2462,9 @@
 }
 
 /**
- * @brief Handler for all prediffer choices, including ID_PREDIFF_MANUAL, ID_PREDIFF_AUTO, ID_NO_PREDIFFER, & specific prediffers
+ * @brief Handler for all prediffer choices.
+ * Prediffer choises include ID_PREDIFF_MANUAL, ID_PREDIFF_AUTO,
+ * ID_NO_PREDIFFER, & specific prediffers.
  */
 void CMergeEditView::SetPredifferByMenu(UINT nID )
 {
@@ -2472,7 +2474,11 @@
 	if (nID == ID_NO_PREDIFFER)
 	{
 		m_CurrentPredifferID = nID;
-		pd->SetPrediffer(NULL);
+		// All flags are set correctly during the construction
+		PrediffingInfo *infoPrediffer = new PrediffingInfo;
+		infoPrediffer->bToBeScanned = 0;
+		infoPrediffer->pluginName.clear();
+		pd->SetPrediffer(infoPrediffer);
 		pd->FlushAndRescan(true);
 		return;
 	}


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