some fixes for null-pointers on icons

psi-im · Aug 1, 2013 · b5d034e · b5d034e
1 parent 47ba447
commit b5d034e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/psipopup.cpp b/src/psipopup.cpp
@@ -132,7 +132,7 @@ void PsiPopup::Private::init(const PsiIcon *_titleIcon, const QString& titleText
 
 	if ( doAlertIcon )
 		titleIcon = new AlertIcon(_titleIcon);
-	else
+	else if(_titleIcon)
 		titleIcon = new PsiIcon(*_titleIcon);
 
 	FancyPopup::setHideTimeout(psiPopup->duration());

diff --git a/src/widgets/fancylabel.cpp b/src/widgets/fancylabel.cpp
@@ -79,10 +79,16 @@ class IconLabel::Private : public QObject
 		copyIcon = _copyIcon;
 
 #ifndef WIDGET_PLUGIN
-		if ( i && copyIcon )
-			icon = new PsiIcon(*i);
-		else
-			icon = (PsiIcon *)i;
+		if ( i ) {
+			if (copyIcon)
+				icon = new PsiIcon(*i);
+			else
+				icon = (PsiIcon *)i;
+		}
+		else {
+			icon = 0;
+		}
+
 #else
     Q_UNUSED(i);
 #endif