[Winmerge-svn] SF.net SVN: winmerge: [3889] branches/R2_6/Src

[<sdo...@us...>]

Revision: 3889
          http://svn.sourceforge.net/winmerge/?rev=3889&view=rev
Author:   sdottaka
Date:     2006-12-02 05:51:25 -0800 (Sat, 02 Dec 2006)

Log Message:
-----------
BUG: [ 1589324 ] WinMegee crashes on copy

Modified Paths:
--------------
    branches/R2_6/Src/Changes.txt
    branches/R2_6/Src/Common/CShellFileOp.cpp

Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt	2006-12-02 13:51:00 UTC (rev 3888)
+++ branches/R2_6/Src/Changes.txt	2006-12-02 13:51:25 UTC (rev 3889)
@@ -3,6 +3,10 @@
 (This summarizes all changes to all files under Src, including Src\Languages.)
 
 2006-12-02 Takashi
+ BUG: [ 1589324 ] WinMegee crashes on copy
+  Src: FileFilterMgr.cpp
+
+2006-12-02 Takashi
  BUG: [ 1603077 ] Doesn't filter the file vc60.idb using "Merge_VC_loose.flt"
   Filters: Merge_VC_loose.flt
 

Modified: branches/R2_6/Src/Common/CShellFileOp.cpp
===================================================================
--- branches/R2_6/Src/Common/CShellFileOp.cpp	2006-12-02 13:51:00 UTC (rev 3888)
+++ branches/R2_6/Src/Common/CShellFileOp.cpp	2006-12-02 13:51:25 UTC (rev 3889)
@@ -527,8 +527,9 @@
         }
 
                                         // drum roll please....
+    ((CFrameWnd *)AfxGetMainWnd())->BeginModalState();
     nAPIRet = SHFileOperation ( &m_rFOS );  // tah-dah!
-
+    ((CFrameWnd *)AfxGetMainWnd())->EndModalState();
                                         // Save the return value from the API.
     if ( NULL != lpnAPIReturn )
         {


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