From 49452a005f4273b3ec91470883f308690e2269ac Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Thu, 2 Sep 2010 19:14:08 -0600
Subject: Fix crash with missing skill icon

Reviewed-by: Bertram
---
 src/gui/skilldialog.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/gui/skilldialog.cpp')

diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp
index 53528cee..207e3ded 100644
--- a/src/gui/skilldialog.cpp
+++ b/src/gui/skilldialog.cpp
@@ -73,9 +73,14 @@ struct SkillInfo
     float progress;
     gcn::Color color;
 
+    SkillInfo() :
+        icon(NULL)
+    {}
+
     ~SkillInfo()
     {
-        icon->decRef();
+        if (icon)
+            icon->decRef();
     }
 
     void setIcon(const std::string &iconPath)
@@ -85,7 +90,8 @@ struct SkillInfo
         {
             icon = res->getImage(iconPath);
         }
-        else
+
+        if (!icon)
         {
             icon = Theme::getImageFromTheme("unknown-item.png");
         }
-- 
cgit v1.2.3-70-g09d2