sw/source/core/doc/DocumentTimerManager.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
New commits: commit 5a93387b70e563fe1b5191d20524dd1d0dfec11b Author: Caolán McNamara <[email protected]> Date: Wed Jan 7 13:13:12 2015 +0000 Resolves: fdo#73165 don't restart timer if already running If the timer is already running and you restart it then it starts counting down again so the timeout occasion just keeps getting pushed out indefinitely. (cherry picked from commit fd0577e6b65cfd948b2fbe16fa1bd06fe0c635b9) Conflicts: sw/source/core/doc/DocumentTimerManager.cxx Change-Id: I964beb0c4756c7bce1e29bdf06cbe9a593ba79cf Reviewed-on: https://gerrit.libreoffice.org/13793 Reviewed-by: Miklos Vajna <[email protected]> Tested-by: Miklos Vajna <[email protected]> diff --git a/sw/source/core/doc/DocumentTimerManager.cxx b/sw/source/core/doc/DocumentTimerManager.cxx index c9f6c16..07aa0aa 100644 --- a/sw/source/core/doc/DocumentTimerManager.cxx +++ b/sw/source/core/doc/DocumentTimerManager.cxx @@ -72,9 +72,11 @@ void DocumentTimerManager::UnblockIdling() maIdleTimer.Start(); } -void DocumentTimerManager::StartBackgroundJobs() { +void DocumentTimerManager::StartBackgroundJobs() +{ // Trigger DoIdleJobs(), asynchronously. - maIdleTimer.Start(); + if (!maIdleTimer.IsActive()) //fdo#73165 if the timer is already running don't restart from 0 + maIdleTimer.Start(); } IMPL_LINK( DocumentTimerManager, DoIdleJobs, Timer *, pTimer )
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
