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

Add fix so there is no merge conflict

Browse source
This commit is contained in:
LajamerrMittesdine 2018-07-12 15:44:12 -04:00
parent 96012d5081
commit e2836c24a3
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/providers/twitch/TwitchAccount.cpp
View file

@ -130,7 +130,7 @@ void TwitchAccount::ignore(const QString &targetName,
this->ignoreByID(targetUserId, targetName, onFinished); // this->ignoreByID(targetUserId, targetName, onFinished); //
}; };
PartialTwitchUser::byName(this->userName_).getId(onIdFetched); PartialTwitchUser::byName(targetName).getId(onIdFetched);
} }
void TwitchAccount::ignoreByID(const QString &targetUserID, const QString &targetName, void TwitchAccount::ignoreByID(const QString &targetUserID, const QString &targetName,
@ -197,7 +197,7 @@ void TwitchAccount::unignore(const QString &targetName,
this->unignoreByID(targetUserId, targetName, onFinished); // this->unignoreByID(targetUserId, targetName, onFinished); //
}; };
PartialTwitchUser::byName(this->userName_).getId(onIdFetched); PartialTwitchUser::byName(targetName).getId(onIdFetched);
} }
void TwitchAccount::unignoreByID( void TwitchAccount::unignoreByID(