diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2010-02-19 15:38:58 -0700 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2010-02-19 15:39:30 -0700 |
| commit | 168203c2185b7cf75c685b0557293720cdda208c (patch) | |
| tree | 2f3abaf8ded4b2e81c6e11908691d6d7a75aefed | |
| parent | 363527d0f95963ba3f4a6d25c8eabc1bb3ad4efe (diff) | |
| download | Mana-168203c2185b7cf75c685b0557293720cdda208c.tar.gz Mana-168203c2185b7cf75c685b0557293720cdda208c.tar.bz2 Mana-168203c2185b7cf75c685b0557293720cdda208c.tar.xz Mana-168203c2185b7cf75c685b0557293720cdda208c.zip | |
Prevent issues when channels are cleared after the ChatWindow
| -rw-r--r-- | src/channel.cpp | 5 | ||||
| -rw-r--r-- | src/gui/widgets/channeltab.cpp | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/channel.cpp b/src/channel.cpp index 38329e0c..fcc8c6f8 100644 --- a/src/channel.cpp +++ b/src/channel.cpp @@ -35,5 +35,8 @@ Channel::Channel(short id, Channel::~Channel() { - delete mTab; + if (mTab) + { + delete mTab; + } } diff --git a/src/gui/widgets/channeltab.cpp b/src/gui/widgets/channeltab.cpp index 0fce98bb..aac1cdb6 100644 --- a/src/gui/widgets/channeltab.cpp +++ b/src/gui/widgets/channeltab.cpp @@ -37,6 +37,9 @@ 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) + mChannel->setTab(0); } void ChannelTab::handleInput(const std::string &msg) |