Remove broken delay when wallpaper not available

This is related to Bug 1288
pull/2/head
Timothy Pearson 11 years ago
parent be73d75739
commit 2e6d8f1b55

@ -4,7 +4,7 @@
//
// Copyright (c) 1999 Martin R. Jones <mjones@kde.org>
// Copyright (c) 2003 Oswald Buddenhagen <ossi@kde.org>
// Copyright (c) 2010-2012 Timothy Pearson <kb9vqf@pearsoncomputing.net>
// Copyright (c) 2010-2013 Timothy Pearson <kb9vqf@pearsoncomputing.net>
//
//kdesktop keeps running and checks user inactivity
@ -1365,31 +1365,6 @@ bool LockProcess::startSaver()
TQPixmap rootWinSnapShot = TQPixmap::grabWindow(TQApplication::desktop()->winId());
slotPaintBackground(rootWinSnapShot);
}
else {
// Sometimes KRootPixmap fails...make sure the desktop is hidden regardless
if (backingPixmap.isNull()) {
if (!mEnsureScreenHiddenTimer) {
mEnsureScreenHiddenTimer = new TQTimer( this );
connect( mEnsureScreenHiddenTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotForcePaintBackground()) );
mEnsureScreenHiddenTimer->start(DESKTOP_WALLPAPER_OBTAIN_TIMEOUT_MS, true);
}
int exitTimer = 0;
while ((backingPixmap.isNull()) && (mEnsureScreenHiddenTimer->isActive())) {
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)) {
printf("[WARNING] The TQt3 timer event loop appears to have hung. Aborting wait for desktop background!\n\r"); fflush(stdout);
break;
}
}
}
}
if (((!(trinity_desktop_lock_delay_screensaver_start && trinity_desktop_lock_forced)) && (!trinity_desktop_lock_in_sec_dlg)) && mHackStartupEnabled) {
if (backingPixmap.isNull()) {

@ -4,6 +4,7 @@
//
// Copyright (c) 1999 Martin R. Jones <mjones@kde.org>
// Copyright (c) 2003 Oswald Buddenhagen <ossi@kde.org>
// Copyright (c) 2010-2013 Timothy Pearson <kb9vqf@pearsoncomputing.net>
//
#ifndef __LOCKENG_H__

Loading…
Cancel
Save