[ 830072 ] "Unload script" does not work

diff --git a/Src/FileTransform.cpp b/Src/FileTransform.cpp
index a2167d7..d8535ae 100644 (file)
--- a/Src/FileTransform.cpp
+++ b/Src/FileTransform.cpp
@@ -782,9 +782,6 @@ BOOL TextTransform_Interactive(CString & text, LPCWSTR TransformationEvent,
        PluginArray * piScriptArray = 
                CScriptsOfThread::GetScriptsOfThreads()->GetAvailableScripts(TransformationEvent);
 
-       if (piScriptArray->GetSize() == 0)
-               return FALSE;
-
        // allocate structures : function name, ordinal of script, function Id in script
        CDWordArray iInScriptArray;
        CDWordArray iIdArray;

diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp
index 6ea29a2..f8fe4d1 100644 (file)
--- a/Src/MergeEditView.cpp
+++ b/Src/MergeEditView.cpp
@@ -1466,7 +1466,7 @@ int callbackForContextMenu(CStringArray * functionNamesList, void * receivedData
        {
                if (response == 100)
                {
-                       CScriptsOfThread::GetScriptsOfThreads()->FreeScriptsForEvent(L"USER_CONTEXT_MENU");
+                       CScriptsOfThread::GetScriptsOfThreads()->FreeScriptsForEvent(L"CONTEXT_MENU");
                }
                else
                        return response-101;

diff --git a/Src/readme.txt b/Src/readme.txt
index 54401ee..5817f64 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,7 @@
+2003-10-25 Laoran
+ [ 830072 ] "Unload script" does not work
+  WinMerge: FileTransform.cpp MergeEditView.cpp
+
 2003-10-25 Perry
  Fix spelling of "delimiter" in comments.
   WinMerge: MainFrm.cpp
@@ -25,6 +29,7 @@
  PATCH: [ 828283 ] Open Read-only files as such
   WinMerge: DirView.cpp files.h files.cpp MainFrm.cpp
 
+>>>>>>> 1.509
 2003-10-24 Perry
  BUG: [ 829437 ] Can't compare two files with unicode filenames
   WinMerge: Diff.cpp