summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorTobias Madl <tobias.madl.dev@gmail.com>2015-05-06 08:34:28 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-05-14 13:28:25 +0000
commitb6044f76405cdf2a956d2c429d5d29f4c711363c (patch)
tree59ad56bbd19abcda28cf1169774bd840a10c4a4f /vcl
parentc60a5753e311918f0c6bd85073390a76de713b3f (diff)
Scheduler: Deactivate task without deletion
Now a task can be temporary deactivatet, without deletion. Change-Id: Ie72f0fe0e1529e2216271a3ae73be1c406947dec Reviewed-on: https://gerrit.libreoffice.org/15640 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/app/scheduler.cxx2
1 files changed, 1 insertions, 1 deletions
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;