[Winmerge-svn] SF.net SVN: winmerge:[7484] branches/R2_14

[<ge...@us...>]

Revision: 7484
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7484&view=rev
Author:   gerundt
Date:     2010-12-28 20:56:59 +0000 (Tue, 28 Dec 2010)

Log Message:
-----------
PATCH: [ 2919475 ] plug in error after ESC in foldercompare
 Submitted by Matthias Mayer

Modified Paths:
--------------
    branches/R2_14/Docs/Users/ChangeLog.txt
    branches/R2_14/Src/FileTransform.cpp

Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt	2010-12-28 20:50:55 UTC (rev 7483)
+++ branches/R2_14/Docs/Users/ChangeLog.txt	2010-12-28 20:56:59 UTC (rev 7484)
@@ -26,6 +26,7 @@
   Bugfix: Added EOL chars between copied file/path names (#2817546)
   Bugfix: Created new matching folder to wrong folder (#2890961)
   Bugfix: Strange scrolling effect in location pane (#2942869)
+  Bugfix: Plugin error after interrupting folder compare (#2919475)
 
 WinMerge 2.13.20 - 2010-10-20 (r7319)
   Add missing keywords to Pascal highlighter (#2834192)

Modified: branches/R2_14/Src/FileTransform.cpp
===================================================================
--- branches/R2_14/Src/FileTransform.cpp	2010-12-28 20:50:55 UTC (rev 7483)
+++ branches/R2_14/Src/FileTransform.cpp	2010-12-28 20:56:59 UTC (rev 7484)
@@ -137,6 +137,9 @@
 	PluginInfo * plugin = CAllThreadsScripts::GetActiveSet()->GetPluginByName(L"FILE_PACK_UNPACK", handler->pluginName.c_str());
 	if (plugin == NULL)
 		plugin = CAllThreadsScripts::GetActiveSet()->GetPluginByName(L"BUFFER_PACK_UNPACK", handler->pluginName.c_str());
+	if (plugin == NULL)
+		return FALSE;
+
 	LPDISPATCH piScript = plugin->m_lpDispatch;
 	if (handler->bWithFile)
 	{


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