summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2010-02-20 09:59:09 +0100
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2010-02-20 10:00:36 +0100
commitfe6f0b9919a7afc366063ce91103469ae422ba3c (patch)
treebf47dcb5089c1de098ae469bedb08fa01371b5bb
parent168203c2185b7cf75c685b0557293720cdda208c (diff)
downloadmana-fe6f0b9919a7afc366063ce91103469ae422ba3c.tar.gz
mana-fe6f0b9919a7afc366063ce91103469ae422ba3c.tar.bz2
mana-fe6f0b9919a7afc366063ce91103469ae422ba3c.tar.xz
mana-fe6f0b9919a7afc366063ce91103469ae422ba3c.zip
Don't check a pointer for 0 before deleting it
This check is built in already.
-rw-r--r--src/channel.cpp5
-rw-r--r--src/gui/widgets/channeltab.cpp4
2 files changed, 3 insertions, 6 deletions
diff --git a/src/channel.cpp b/src/channel.cpp
index fcc8c6f8..38329e0c 100644
--- a/src/channel.cpp
+++ b/src/channel.cpp
@@ -35,8 +35,5 @@ Channel::Channel(short id,
Channel::~Channel()
{
- if (mTab)
- {
- delete mTab;
- }
+ delete mTab;
}
diff --git a/src/gui/widgets/channeltab.cpp b/src/gui/widgets/channeltab.cpp
index aac1cdb6..48056f52 100644
--- a/src/gui/widgets/channeltab.cpp
+++ b/src/gui/widgets/channeltab.cpp
@@ -37,8 +37,8 @@ ChannelTab::ChannelTab(Channel *channel) :
ChannelTab::~ChannelTab()
{
- // Clear tab so the channel won't try to (if the ChatWindow is cleared
- // before the channels are, we'll run into issues without this)
+ // Clear tab so the channel won't try to delete it again (otherwise we'd
+ // run into issues if the ChatWindow is deleted before the channels are)
mChannel->setTab(0);
}