noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

join channels when IrcChonnection started

Browse source
This commit is contained in:
fourtf 2017-01-30 20:13:53 +01:00
parent 3c8d2740de
commit 69fb3652dd
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
ircmanager.cpp
View file

@ -132,9 +132,8 @@ IrcManager::beginConnecting()
c->sendCommand(IrcCommand::createCapability("REQ", "twitch.tv/commands")); c->sendCommand(IrcCommand::createCapability("REQ", "twitch.tv/commands"));
c->sendCommand(IrcCommand::createCapability("REQ", "twitch.tv/tags")); c->sendCommand(IrcCommand::createCapability("REQ", "twitch.tv/tags"));
c->open(); QMutexLocker locker(&IrcManager::connectionMutex);
IrcManager::connectionMutex.lock();
if (generation == IrcManager::connectionGeneration) { if (generation == IrcManager::connectionGeneration) {
c->moveToThread(QCoreApplication::instance()->thread()); c->moveToThread(QCoreApplication::instance()->thread());
IrcManager::connection = std::shared_ptr<IrcConnection>(c); IrcManager::connection = std::shared_ptr<IrcConnection>(c);
@ -142,12 +141,13 @@ IrcManager::beginConnecting()
auto channels = Channels::getItems(); auto channels = Channels::getItems();
for (auto &channel : channels) { for (auto &channel : channels) {
IrcManager::sendJoin(channel.get()->getName()); c->sendRaw("JOIN #" + channel.get()->getName());
} }
c->open();
} else { } else {
delete c; delete c;
} }
IrcManager::connectionMutex.unlock();
} }
void void
@ -155,6 +155,7 @@ IrcManager::disconnect()
{ {
IrcManager::connectionMutex.lock(); IrcManager::connectionMutex.lock();
auto c = IrcManager::connection;
if (IrcManager::connection.get() != NULL) { if (IrcManager::connection.get() != NULL) {
IrcManager::connection = std::shared_ptr<IrcConnection>(); IrcManager::connection = std::shared_ptr<IrcConnection>();
} }
@ -174,9 +175,11 @@ void
IrcManager::sendJoin(const QString &channel) IrcManager::sendJoin(const QString &channel)
{ {
IrcManager::connectionMutex.lock(); IrcManager::connectionMutex.lock();
if (IrcManager::connection != NULL) {
IrcManager::connection->sendRaw("JOIN #" + channel); if (IrcManager::connection.get() != NULL) {
IrcManager::connection.get()->sendRaw("JOIN #" + channel);
} }
IrcManager::connectionMutex.unlock(); IrcManager::connectionMutex.unlock();
} }
@ -184,9 +187,11 @@ void
IrcManager::partChannel(const QString &channel) IrcManager::partChannel(const QString &channel)
{ {
IrcManager::connectionMutex.lock(); IrcManager::connectionMutex.lock();
if (IrcManager::connection != NULL) {
IrcManager::connection->sendRaw("PART #" + channel); if (IrcManager::connection.get() != NULL) {
IrcManager::connection.get()->sendRaw("PART #" + channel);
} }
IrcManager::connectionMutex.unlock(); IrcManager::connectionMutex.unlock();
} }