don't try to stop polling if we're currently not, BUG: 258170
svn path=/trunk/KDE/kdebase/workspace/; revision=1203503
This commit is contained in:
parent
48447a3d26
commit
b3e01ab0f7
1 changed files with 4 additions and 2 deletions
|
@ -290,8 +290,9 @@ void StartupFeedbackEffect::start( const QString& icon )
|
||||||
{
|
{
|
||||||
if( m_type == NoFeedback )
|
if( m_type == NoFeedback )
|
||||||
return;
|
return;
|
||||||
|
if ( !m_active )
|
||||||
|
effects->startMousePolling();
|
||||||
m_active = true;
|
m_active = true;
|
||||||
effects->startMousePolling();
|
|
||||||
QPixmap iconPixmap = KIconLoader::global()->loadIcon( icon, KIconLoader::Small, 0,
|
QPixmap iconPixmap = KIconLoader::global()->loadIcon( icon, KIconLoader::Small, 0,
|
||||||
KIconLoader::DefaultState, QStringList(), 0, true ); // return null pixmap if not found
|
KIconLoader::DefaultState, QStringList(), 0, true ); // return null pixmap if not found
|
||||||
if( iconPixmap.isNull() )
|
if( iconPixmap.isNull() )
|
||||||
|
@ -302,8 +303,9 @@ void StartupFeedbackEffect::start( const QString& icon )
|
||||||
|
|
||||||
void StartupFeedbackEffect::stop()
|
void StartupFeedbackEffect::stop()
|
||||||
{
|
{
|
||||||
|
if ( m_active )
|
||||||
|
effects->stopMousePolling();
|
||||||
m_active = false;
|
m_active = false;
|
||||||
effects->stopMousePolling();
|
|
||||||
switch( m_type )
|
switch( m_type )
|
||||||
{
|
{
|
||||||
case BouncingFeedback:
|
case BouncingFeedback:
|
||||||
|
|
Loading…
Reference in a new issue