From 3c7ec0569a4fce157e608021133bdc6cac679c10 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 8 Jun 2011 15:39:25 +0300 Subject: Zero variables after calling decRef(). --- src/gui/widgets/avatarlistbox.cpp | 6 ++++++ src/gui/widgets/desktop.cpp | 3 +++ src/gui/widgets/dropshortcutcontainer.cpp | 3 +++ src/gui/widgets/emoteshortcutcontainer.cpp | 3 +++ src/gui/widgets/resizegrip.cpp | 3 +++ 5 files changed, 18 insertions(+) (limited to 'src/gui/widgets') 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) -- cgit v1.2.3-70-g09d2