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

fixed (live) issue #626 (#631)

Browse source
This commit is contained in:
apa420 2018-07-23 07:12:14 -06:00 committed by fourtf
parent f060907678
commit 133bd6a766
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/providers/twitch/TwitchChannel.cpp
View file

@ -302,18 +302,18 @@ void TwitchChannel::refreshLiveStatus()
//<<<<<<< HEAD //<<<<<<< HEAD
// auto request = makeGetStreamRequest(roomID, QThread::currentThread()); // auto request = makeGetStreamRequest(roomID, QThread::currentThread());
//======= //=======
// auto request = NetworkRequest::twitchRequest(url); auto request = NetworkRequest::twitchRequest(url);
// request.setCaller(QThread::currentThread()); request.setCaller(QThread::currentThread());
//>>>>>>> 9bfbdefd2f0972a738230d5b95a009f73b1dd933 //>>>>>>> 9bfbdefd2f0972a738230d5b95a009f73b1dd933
// request.onSuccess([this, weak = this->weak_from_this()](auto result) { request.onSuccess([this, weak = this->weak_from_this()](auto result) {
// ChannelPtr shared = weak.lock(); ChannelPtr shared = weak.lock();
// if (!shared) return false; if (!shared) return false;
// return this->parseLiveStatus(result.parseRapidJson()); return this->parseLiveStatus(result.parseRapidJson());
// }); });
// request.execute(); request.execute();
} }
bool TwitchChannel::parseLiveStatus(const rapidjson::Document &document) bool TwitchChannel::parseLiveStatus(const rapidjson::Document &document)