TDE
/
knemo
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix abort on startup due to oversized tray icon creation when icon widget has not yet been shown

Browse Source
pull/1/head
Timothy Pearson 10 years ago
parent 81bdfc2374
commit bba29e95ab
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File

10
src/knemod/interfaceicon.cpp
Unescape View File

@ -88,24 +88,24 @@ void InterfaceIcon::updateStatus( int status )
if ( status == Interface::NOT_AVAILABLE || if ( status == Interface::NOT_AVAILABLE ||
status == Interface::NOT_EXISTING ) 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 ) && else if ( ( status & Interface::RX_TRAFFIC ) &&
( status & Interface::TX_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 ) 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 ) 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 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 ) );
} }
} }

Write Preview
Loading…
Cancel
Save