From fe6f0b9919a7afc366063ce91103469ae422ba3c Mon Sep 17 00:00:00 2001 From: Thorbjørn Lindeijer Date: Sat, 20 Feb 2010 09:59:09 +0100 Subject: Don't check a pointer for 0 before deleting it This check is built in already. --- src/channel.cpp | 5 +---- src/gui/widgets/channeltab.cpp | 4 ++-- 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); } -- cgit v1.2.3-60-g2f50