PATCH: [ 2919475 ] plug in error after ESC in foldercompare

 Submitted by Matthias Mayer

diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt
index 4c8cb73..cdf7a1e 100644 (file)
--- a/Docs/Users/ChangeLog.txt
+++ b/Docs/Users/ChangeLog.txt
@@ -3,6 +3,9 @@ Numbers in parentheses refer to SourceForge.net tracker item numbers (#XXXXX) or
 to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL:
 http://winmerge.org/tracker/[tracker-id]
 
+WinMerge 2.3.11
+  Bugfix: Plugin error after interrupting folder compare (#2919475)
+
 WinMerge 2.13.10 2009-12-21 (r7051)
   Visual Studio project files upgraded to VS2005 format (r7045)
   Bugfix: New Persian translation don't work (#2884856)

diff --git a/Src/FileTransform.cpp b/Src/FileTransform.cpp
index 9f215c0..93a0ab1 100644 (file)
--- a/Src/FileTransform.cpp
+++ b/Src/FileTransform.cpp
@@ -137,6 +137,9 @@ BOOL FileTransform_Unpacking(String & filepath, const PackingInfo * handler, int
        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)
        {