noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix crash bug when closing notebook

Browse source
This commit is contained in:
Rasmus Karlsson 2017-05-29 21:02:01 +02:00
parent 5208e0f2fd
commit 971489f8f1
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
widgets/chatwidget.cpp
View file

@ -36,6 +36,7 @@ ChatWidget::ChatWidget(QWidget *parent)
ChatWidget::~ChatWidget() ChatWidget::~ChatWidget()
{ {
detachChannel();
} }
std::shared_ptr<Channel> ChatWidget::getChannel() const std::shared_ptr<Channel> ChatWidget::getChannel() const
@ -69,7 +70,7 @@ void ChatWidget::setChannelName(const QString &name)
if (!_channelName.isEmpty()) { if (!_channelName.isEmpty()) {
ChannelManager::getInstance().removeChannel(_channelName); ChannelManager::getInstance().removeChannel(_channelName);
detachChannel(_channel); detachChannel();
} }
// update members // update members
@ -128,7 +129,7 @@ void ChatWidget::attachChannel(SharedChannel channel)
} }
} }
void ChatWidget::detachChannel(std::shared_ptr<Channel> channel) void ChatWidget::detachChannel()
{ {
// on message added // on message added
_messageAppendedConnection.disconnect(); _messageAppendedConnection.disconnect();

2
widgets/chatwidget.h
View file

@ -42,7 +42,7 @@ protected:
private: private:
void attachChannel(std::shared_ptr<Channel> _channel); void attachChannel(std::shared_ptr<Channel> _channel);
void detachChannel(std::shared_ptr<Channel> _channel); void detachChannel();
messages::LimitedQueue<messages::SharedMessageRef> _messages; messages::LimitedQueue<messages::SharedMessageRef> _messages;