summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-11-12 15:21:03 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-11-12 15:21:03 -0600
commitf8903b3564659e9ff2e8779610e56da6efaca4f0 (patch)
tree39eefc0c6574a027bb57df541818976de1ffdbae
parent5bb5839ff76e7b6c224d8ce6b4bcbdf3c1253271 (diff)
downloadtdebase-f8903b3564659e9ff2e8779610e56da6efaca4f0.tar.gz
tdebase-f8903b3564659e9ff2e8779610e56da6efaca4f0.zip
Do not attempt to set null user images in tdm tdecontrol module
This resolves Bug 1899
-rw-r--r--kcontrol/tdm/tdm-users.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/kcontrol/tdm/tdm-users.cpp b/kcontrol/tdm/tdm-users.cpp
index d39d4048e..fe2f31c65 100644
--- a/kcontrol/tdm/tdm-users.cpp
+++ b/kcontrol/tdm/tdm-users.cpp
@@ -263,7 +263,9 @@ void TDMUsersWidget::slotUserSelected()
p.load( m_userPixDir + ".default.face.icon" );
rstuserbutton->setEnabled( false );
}
- userbutton->setPixmap( p.smoothScale( 48, 48, TQ_ScaleMin ) );
+ if (!p.isNull()) {
+ userbutton->setPixmap( p.smoothScale( 48, 48, TQ_ScaleMin ) );
+ }
}