From bba29e95ab1eaf3099c44b1672fa4996bf24095d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 8 Jul 2014 08:36:34 -0500 Subject: [PATCH] Fix abort on startup due to oversized tray icon creation when icon widget has not yet been shown --- src/knemod/interfaceicon.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/knemod/interfaceicon.cpp b/src/knemod/interfaceicon.cpp index 7b99041..cebcbc2 100644 --- a/src/knemod/interfaceicon.cpp +++ b/src/knemod/interfaceicon.cpp @@ -88,24 +88,24 @@ void InterfaceIcon::updateStatus( int status ) if ( status == Interface::NOT_AVAILABLE || status == Interface::NOT_EXISTING ) { - mTray->setPixmap( mTray->loadSizedIcon( ICON_DISCONNECTED + suffix, mTray->width() ) ); + mTray->setPixmap( mTray->isShown() ? mTray->loadSizedIcon( ICON_DISCONNECTED + suffix, mTray->width() ) : mTray->loadIcon( ICON_DISCONNECTED + suffix ) ); } else if ( ( status & Interface::RX_TRAFFIC ) && ( status & Interface::TX_TRAFFIC ) ) { - mTray->setPixmap( mTray->loadSizedIcon( ICON_TRAFFIC + suffix, mTray->width() ) ); + mTray->setPixmap( mTray->isShown() ? mTray->loadSizedIcon( ICON_TRAFFIC + suffix, mTray->width() ) : mTray->loadIcon( ICON_TRAFFIC + suffix ) ); } else if ( status & Interface::RX_TRAFFIC ) { - mTray->setPixmap( mTray->loadSizedIcon( ICON_INCOMING + suffix, mTray->width() ) ); + mTray->setPixmap( mTray->isShown() ? mTray->loadSizedIcon( ICON_INCOMING + suffix, mTray->width() ) : mTray->loadIcon( ICON_INCOMING + suffix ) ); } else if ( status & Interface::TX_TRAFFIC ) { - mTray->setPixmap( mTray->loadSizedIcon( ICON_OUTGOING + suffix, mTray->width() ) ); + mTray->setPixmap( mTray->isShown() ? mTray->loadSizedIcon( ICON_OUTGOING + suffix, mTray->width() ) : mTray->loadIcon( ICON_OUTGOING + suffix ) ); } else { - mTray->setPixmap( mTray->loadSizedIcon( ICON_CONNECTED + suffix, mTray->width() ) ); + mTray->setPixmap( mTray->isShown() ? mTray->loadSizedIcon( ICON_CONNECTED + suffix, mTray->width() ) : mTray->loadIcon( ICON_CONNECTED + suffix ) ); } }