8 files changed, 27 insertions, 0 deletions
diff --git a/src/gui/emotepopup.cpp b/src/gui/emotepopup.cpp
index d23443a2f..3a754d0e3 100644
--- a/src/gui/emotepopup.cpp
+++ b/src/gui/emotepopup.cpp
@@ -77,7 +77,10 @@ EmotePopup::EmotePopup():
 EmotePopup::~EmotePopup()
 {
     if (mSelectionImage)
+    {
         mSelectionImage->decRef();
+        mSelectionImage = 0;
+    }
 }
 
 void EmotePopup::draw(gcn::Graphics *graphics)
diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp
index e7def2234..f5117ed5a 100644
--- a/src/gui/itempopup.cpp
+++ b/src/gui/itempopup.cpp
@@ -92,7 +92,10 @@ ItemPopup::~ItemPopup()
     {
         Image *image = mIcon->getImage();
         if (image)
+        {
             image->decRef();
+            image = 0;
+        }
     }
 }
 
diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp
index a164d59d7..14e245ae1 100644
--- a/src/gui/skilldialog.cpp
+++ b/src/gui/skilldialog.cpp
@@ -87,7 +87,10 @@ struct SkillInfo
     ~SkillInfo()
     {
         if (icon)
+        {
             icon->decRef();
+            icon = 0;
+        }
     }
 
     void setIcon(const std::string &iconPath)
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index c4737160b..a7331ae78 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -78,9 +78,15 @@ AvatarListBox::~AvatarListBox()
     if (instances == 0)
     {
         if (onlineIcon)
+        {
             onlineIcon->decRef();
+            onlineIcon = 0;
+        }
         if (offlineIcon)
+        {
             offlineIcon->decRef();
+            offlineIcon = 0;
+        }
     }
 }
 
diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp
index 8b6217da2..f7183553f 100644
--- a/src/gui/widgets/desktop.cpp
+++ b/src/gui/widgets/desktop.cpp
@@ -60,7 +60,10 @@ Desktop::Desktop()
 Desktop::~Desktop()
 {
     if (mWallpaper)
+    {
         mWallpaper->decRef();
+        mWallpaper = 0;
+    }
 }
 
 void Desktop::reloadWallpaper()
diff --git a/src/gui/widgets/dropshortcutcontainer.cpp b/src/gui/widgets/dropshortcutcontainer.cpp
index 224830d8f..fd920ffa4 100644
--- a/src/gui/widgets/dropshortcutcontainer.cpp
+++ b/src/gui/widgets/dropshortcutcontainer.cpp
@@ -77,7 +77,10 @@ DropShortcutContainer::DropShortcutContainer():
 DropShortcutContainer::~DropShortcutContainer()
 {
     if (mBackgroundImg)
+    {
         mBackgroundImg->decRef();
+        mBackgroundImg = 0;
+    }
     delete mItemPopup;
     mItemPopup = 0;
 }
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index c45c0a44c..bdba4a807 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -87,7 +87,10 @@ EmoteShortcutContainer::~EmoteShortcutContainer()
     delete mEmotePopup;
 
     if (mBackgroundImg)
+    {
         mBackgroundImg->decRef();
+        mBackgroundImg = 0;
+    }
 }
 
 void EmoteShortcutContainer::draw(gcn::Graphics *graphics)
diff --git a/src/gui/widgets/resizegrip.cpp b/src/gui/widgets/resizegrip.cpp
index cf017b9ec..f477e51a8 100644
--- a/src/gui/widgets/resizegrip.cpp
+++ b/src/gui/widgets/resizegrip.cpp
@@ -67,7 +67,10 @@ ResizeGrip::~ResizeGrip()
     mInstances--;
 
     if (mInstances == 0 && gripImage)
+    {
         gripImage->decRef();
+        gripImage = 0;
+    }
 }
 
 void ResizeGrip::draw(gcn::Graphics *graphics)