Attempt to work around issue described in Bug 1288

(cherry picked from commit 4de72a5ddd)
v3.5.13-sru
Timothy Pearson 12 years ago committed by Slávek Banko
parent 339bb1ff18
commit 5eb1e8bfcf

@ -58,6 +58,7 @@
#include <tqimage.h> #include <tqimage.h>
#include <tqregexp.h> #include <tqregexp.h>
#include <tqpainter.h> #include <tqpainter.h>
#include <tqeventloop.h>
#include <tqdatetime.h> #include <tqdatetime.h>
@ -1304,8 +1305,18 @@ bool LockProcess::startSaver()
mEnsureScreenHiddenTimer->start(DESKTOP_WALLPAPER_OBTAIN_TIMEOUT_MS, true); mEnsureScreenHiddenTimer->start(DESKTOP_WALLPAPER_OBTAIN_TIMEOUT_MS, true);
} }
int exitTimer = 0;
while ((backingPixmap.isNull()) && (mEnsureScreenHiddenTimer->isActive())) { while ((backingPixmap.isNull()) && (mEnsureScreenHiddenTimer->isActive())) {
kapp->processEvents(); kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput);
// HACK
// Work around an issue with the underlying system whereby the TQTimer sometimes fails to time out!
// This issue was reported in Bug #1288
usleep(100);
exitTimer++;
if (exitTimer > (DESKTOP_WALLPAPER_OBTAIN_TIMEOUT_MS*10)) {
break;
}
} }
} }
} }

Loading…
Cancel
Save