**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License (version 2) as
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License (version 2) as
BackgroundSupervisor::BackgroundSupervisor (wxFrame* pParentFrame, wxDocument* pDocument, const char* const pszProcessTitle, int iTotalUnits)
: m_pParentFrame(pParentFrame), m_pDocument(pDocument), m_pDialogProgress(NULL), m_strProcessTitle(pszProcessTitle),
m_iTotalUnits(iTotalUnits), m_iNumThreads(0), m_bDone(false), m_bFail(false), m_bCancelled(false),
BackgroundSupervisor::BackgroundSupervisor (wxFrame* pParentFrame, wxDocument* pDocument, const char* const pszProcessTitle, int iTotalUnits)
: m_pParentFrame(pParentFrame), m_pDocument(pDocument), m_pDialogProgress(NULL), m_strProcessTitle(pszProcessTitle),
m_iTotalUnits(iTotalUnits), m_iNumThreads(0), m_bDone(false), m_bFail(false), m_bCancelled(false),
- m_pTimer(NULL), m_bBackgroundTaskAdded(false),
+ m_pTimer(NULL), m_bBackgroundTaskAdded(false), m_bWorkersDeleted(false),
- for (int i = 0; i < m_iNumThreads; i++)
- if (m_vecpThreads[i]) {
- m_vecpThreads[i]->Delete(); // sends Destroy message to workers
- }
-
- while (m_iRunning > 0) {
- Sleep(50);
- ProcessPendingEvents();
- }
-
if (m_bBackgroundTaskAdded) {
wxCommandEvent doneEvent (wxEVT_COMMAND_MENU_SELECTED, MSG_BACKGROUND_SUPERVISOR_REMOVE);
doneEvent.SetClientData (this);
if (m_bBackgroundTaskAdded) {
wxCommandEvent doneEvent (wxEVT_COMMAND_MENU_SELECTED, MSG_BACKGROUND_SUPERVISOR_REMOVE);
doneEvent.SetClientData (this);
+void
+BackgroundSupervisor::deleteWorkers()
+{
+ wxCriticalSectionLocker lock (m_critsectThreads);
+ if (m_bWorkersDeleted)
+ return;
+
+ for (int i = 0; i < m_iNumThreads; i++)
+ if (m_vecpThreads[i]) {
+ m_vecpThreads[i]->Delete(); // sends Destroy message to workers
+ }
+
+ while (m_iRunning > 0) {
+ m_pMyThread->Sleep(50);
+ ProcessPendingEvents();
+ }
+ m_iRunning = 0;
+ m_bWorkersDeleted = true;
+}
+