diff options
| -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) |