summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2012-01-16 16:50:09 -0600
committerTimothy Pearson <[email protected]>2012-01-16 16:50:09 -0600
commite6b6f2eafdf6dbe3b4d5526c75e9d7c5aaee5ccb (patch)
tree0d090415c62b4d7cd5c433f8468b081f48750344
parent2b035349c31fe64c31d2c050892b117a3a807179 (diff)
downloadtdelibs-e6b6f2eafdf6dbe3b4d5526c75e9d7c5aaee5ccb.tar.gz
tdelibs-e6b6f2eafdf6dbe3b4d5526c75e9d7c5aaee5ccb.zip
Fix kiconloader crash when libart is not in use
-rw-r--r--tdecore/kiconloader.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/tdecore/kiconloader.cpp b/tdecore/kiconloader.cpp
index 3c5cf7135..9b95084a0 100644
--- a/tdecore/kiconloader.cpp
+++ b/tdecore/kiconloader.cpp
@@ -753,9 +753,9 @@ TQPixmap KIconLoader::loadIcon(const TQString& _name, KIcon::Group group, int si
return pix;
}
}
-#ifdef HAVE_LIBART
else
{
+#ifdef HAVE_LIBART
// Special stuff for SVG icons
KSVGIconEngine *svgEngine = new KSVGIconEngine();
@@ -765,8 +765,10 @@ TQPixmap KIconLoader::loadIcon(const TQString& _name, KIcon::Group group, int si
img = new TQImage();
delete svgEngine;
- }
+#else
+ img = new TQImage();
#endif
+ }
iconType = icon.type;
iconThreshold = icon.threshold;