|
From: <ga...@us...> - 2006-09-24 09:54:45
|
Revision: 3633
http://svn.sourceforge.net/winmerge/?rev=3633&view=rev
Author: galh
Date: 2006-09-24 02:54:27 -0700 (Sun, 24 Sep 2006)
Log Message:
-----------
BUG: [ 1564283 ] Parameter -x causes files to be closed after merging
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/MergeDoc.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-24 08:53:00 UTC (rev 3632)
+++ trunk/Src/Changes.txt 2006-09-24 09:54:27 UTC (rev 3633)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-09-24 Gal
+ BUG: [ 1564283 ] Parameter -x causes files to be closed after merging
+ Src: MergeDoc.cpp
+
2006-09-24 Kimmo
PATCH: [ 1564280 ] Stack corruption in LanguageSelect
Src/Common: LanguageSelect.cpp
Modified: trunk/Src/MergeDoc.cpp
===================================================================
--- trunk/Src/MergeDoc.cpp 2006-09-24 08:53:00 UTC (rev 3632)
+++ trunk/Src/MergeDoc.cpp 2006-09-24 09:54:27 UTC (rev 3633)
@@ -2869,6 +2869,10 @@
{
ShowRescanError(nRescanResult, bBinary, bIdentical);
}
+
+ // Exit if files are identical should only work for the first
+ // comparison and must be disabled afterward.
+ GetMainFrame()->m_bExitIfNoDiff = FALSE;
}
else
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
