[Winmerge-svn] SF.net SVN: winmerge: [3652] trunk/Src
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ki...@us...> - 2006-09-27 14:32:23
|
Revision: 3652 http://svn.sourceforge.net/winmerge/?rev=3652&view=rev Author: kimmov Date: 2006-09-27 07:32:16 -0700 (Wed, 27 Sep 2006) Log Message: ----------- BUG: [ 1563187 ] Can't close a file compare with -e switch Modified Paths: -------------- trunk/Src/Changes.txt trunk/Src/MergeDoc.cpp Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-09-27 14:29:37 UTC (rev 3651) +++ trunk/Src/Changes.txt 2006-09-27 14:32:16 UTC (rev 3652) @@ -5,6 +5,8 @@ 2006-09-27 Kimmo PATCH: [ 1565917 ] Register.bat to register ShellExt for 64-bit Windows ShellExtension: Register.bat + BUG: [ 1563187 ] Can't close a file compare with -e switch + Src: MergeDoc.cpp 2006-09-26 Tim PATCH: [ 1565359 ] Various Updates in German Translation for WinMerge 2.6 Modified: trunk/Src/MergeDoc.cpp =================================================================== --- trunk/Src/MergeDoc.cpp 2006-09-27 14:29:37 UTC (rev 3651) +++ trunk/Src/MergeDoc.cpp 2006-09-27 14:32:16 UTC (rev 3652) @@ -1253,7 +1253,7 @@ BOOL CMergeDoc::CanCloseFrame(CFrameWnd* /*pFrame*/) { // Allow user to cancel closing - if (!GetMainFrame()->m_bEscShutdown && PromptAndSaveIfNeeded(TRUE)) + if (PromptAndSaveIfNeeded(TRUE)) { // Set modified status to false so that we are not asking // about saving again in OnCloseDocument() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |