Browse Source

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

tags/r14.0.0
Timothy Pearson 6 years ago
parent
commit
bba29e95ab
1 changed files with 5 additions and 5 deletions
  1. +5
    -5
      src/knemod/interfaceicon.cpp

+ 5
- 5
src/knemod/interfaceicon.cpp View File

@@ -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 ) );
}
}



Loading…
Cancel
Save