From b6044f76405cdf2a956d2c429d5d29f4c711363c Mon Sep 17 00:00:00 2001 From: Tobias Madl Date: Wed, 6 May 2015 08:34:28 +0000 Subject: Scheduler: Deactivate task without deletion MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now a task can be temporary deactivatet, without deletion. Change-Id: Ie72f0fe0e1529e2216271a3ae73be1c406947dec Reviewed-on: https://gerrit.libreoffice.org/15640 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- vcl/source/app/scheduler.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'vcl') diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx index a213fe2623ea..20b11dc4c922 100644 --- a/vcl/source/app/scheduler.cxx +++ b/vcl/source/app/scheduler.cxx @@ -47,7 +47,7 @@ ImplSchedulerData *ImplSchedulerData::GetMostImportantTask( bool bTimer ) for ( ImplSchedulerData *pSchedulerData = pSVData->mpFirstSchedulerData; pSchedulerData; pSchedulerData = pSchedulerData->mpNext ) { if ( !pSchedulerData->mpScheduler || pSchedulerData->mbDelete || pSchedulerData->mnUpdateStack >= pSVData->mnUpdateStack - || !pSchedulerData->mpScheduler->ReadyForSchedule( bTimer ) ) + || !pSchedulerData->mpScheduler->ReadyForSchedule( bTimer ) || !pSchedulerData->mpScheduler->IsActive()) continue; if (!pMostUrgent) pMostUrgent = pSchedulerData; -- cgit