Index: src/ch/MainWnd.cpp =================================================================== diff -u -N -r5057e08b0cc064972abeb94a488e5f12d9db14a0 -r9352ed0c4fe447a36bc728640c307be6d41455fd --- src/ch/MainWnd.cpp (.../MainWnd.cpp) (revision 5057e08b0cc064972abeb94a488e5f12d9db14a0) +++ src/ch/MainWnd.cpp (.../MainWnd.cpp) (revision 9352ed0c4fe447a36bc728640c307be6d41455fd) @@ -405,13 +405,13 @@ CTask* pTask; if (GetConfig().get_signed_num(PP_CMLIMITMAXOPERATIONS) == 0 || m_tasks.GetOperationsPending() < (UINT)GetConfig().get_signed_num(PP_CMLIMITMAXOPERATIONS)) { - for (int i=0;iGetStatus(ST_WAITING_MASK) & ST_WAITING && (GetConfig().get_signed_num(PP_CMLIMITMAXOPERATIONS) == 0 || m_tasks.GetOperationsPending() < (UINT)GetConfig().get_signed_num(PP_CMLIMITMAXOPERATIONS))) { - TRACE("Enabling task %ld\n", i); + TRACE("Enabling task %ld\n", stIndex); pTask->SetContinueFlag(true); pTask->IncreaseOperationsPending(); pTask->SetStatus(0, ST_WAITING); // turn off wait state @@ -476,7 +476,7 @@ // special operation - modify stuff CFiltersArray ffFilters; - int iPriority=(int)GetConfig().get_signed_num(PP_CMDEFAULTPRIORITY); + int iPriority = boost::numeric_cast(GetConfig().get_signed_num(PP_CMDEFAULTPRIORITY)); BUFFERSIZES bsSizes; bsSizes.m_bOnlyDefault=GetConfig().get_bool(PP_BFUSEONLYDEFAULT); bsSizes.m_uiDefaultSize=(UINT)GetConfig().get_signed_num(PP_BFDEFAULT); @@ -591,7 +591,7 @@ CCustomCopyDlg dlg; dlg.m_ccData.m_iOperation=0; - dlg.m_ccData.m_iPriority=(int)rConfig.get_signed_num(PP_CMDEFAULTPRIORITY); + dlg.m_ccData.m_iPriority = boost::numeric_cast(rConfig.get_signed_num(PP_CMDEFAULTPRIORITY)); dlg.m_ccData.m_bsSizes.m_bOnlyDefault=rConfig.get_bool(PP_BFUSEONLYDEFAULT); dlg.m_ccData.m_bsSizes.m_uiDefaultSize=(UINT)rConfig.get_signed_num(PP_BFDEFAULT); dlg.m_ccData.m_bsSizes.m_uiOneDiskSize=(UINT)rConfig.get_signed_num(PP_BFONEDISK); @@ -766,7 +766,7 @@ } // count of shortcuts to store - g_pscsShared->iShortcutsCount = (int)__min(cvShortcuts.size(), (SHARED_BUFFERSIZE - 5 * sizeof(_COMMAND)) / sizeof(_SHORTCUT)); + g_pscsShared->iShortcutsCount = boost::numeric_cast(std::min(cvShortcuts.size(), (SHARED_BUFFERSIZE - 5 * sizeof(_COMMAND)) / sizeof(_SHORTCUT))); _SHORTCUT* pShortcut = g_pscsShared->GetShortcutsPtr(); CShortcut sc; for (int i=0;iiShortcutsCount;i++) @@ -926,17 +926,19 @@ CClipboardMonitor::StopMonitor(); // kill all unfinished tasks - send kill request - for (int i=0;iSetKillFlag(); + for(size_t stIndex = 0; stIndex < m_tasks.GetSize(); ++stIndex) + { + m_tasks.GetAt(stIndex)->SetKillFlag(); + } // wait for finishing - for (int i=0;iGetKilledFlag()) + while(!m_tasks.GetAt(stIndex)->GetKilledFlag()) Sleep(10); - m_tasks.GetAt(i)->CleanupAfterKill(); + m_tasks.GetAt(stIndex)->CleanupAfterKill(); } - + // save m_tasks.SaveProgress();