Leave the class name as CIniOptionsMgr, but rename the filename to IniOptionsMgr.*

[winmerge-jp/winmerge-jp.git] / Src / DiffThread.cpp

diff --git a/Src/DiffThread.cpp b/Src/DiffThread.cpp
index 97d130e..552b19d 100644 (file)
--- a/Src/DiffThread.cpp
+++ b/Src/DiffThread.cpp
@@ -1,19 +1,4 @@
-/////////////////////////////////////////////////////////////////////////////
-//    License (GPLv2+):
-//    This program is free software; you can redistribute it and/or modify
-//    it under the terms of the GNU General Public License as published by
-//    the Free Software Foundation; either version 2 of the License, or (at
-//    your option) any later version.
-//    
-//    This program is distributed in the hope that it will be useful, but
-//    WITHOUT ANY WARRANTY; without even the implied warranty of
-//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//    GNU General Public License for more details.
-//
-//    You should have received a copy of the GNU General Public License
-//    along with this program; if not, write to the Free Software
-//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-/////////////////////////////////////////////////////////////////////////////
+// SPDX-License-Identifier: GPL-2.0-or-later
 /** 
  * @file  DiffThread.cpp
  *
@@ -29,6 +14,7 @@
 #include "UnicodeString.h"
 #include "CompareStats.h"
 #include "IAbortable.h"
+#include "Plugins.h"
 #include "DebugNew.h"
 
 using Poco::Thread;
@@ -122,7 +108,8 @@ static void DiffThreadCollect(void *pParam)
        // Stash abortable interface into context
        myStruct->context->SetAbortable(myStruct->m_pAbortgate);
 
-       myStruct->m_fncCollect(myStruct);
+       if (myStruct->m_fncCollect)
+               myStruct->m_fncCollect(myStruct);
 
        // Release Semaphore() once again to signal that collect phase is ready
        myStruct->pSemaphore->set();
@@ -143,6 +130,7 @@ static void DiffThreadCollect(void *pParam)
 static void DiffThreadCompare(void *pParam)
 {
        DiffFuncStruct *myStruct = static_cast<DiffFuncStruct *>(pParam);
+       CAssureScriptsForThread scriptsForRescan;
 
        // Stash abortable interface into context
        myStruct->context->SetAbortable(myStruct->m_pAbortgate);