From e2836c24a3419213690917f1a1c6ee530a6314e1 Mon Sep 17 00:00:00 2001 From: LajamerrMittesdine Date: Thu, 12 Jul 2018 15:44:12 -0400 Subject: [PATCH] Add fix so there is no merge conflict --- src/providers/twitch/TwitchAccount.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/providers/twitch/TwitchAccount.cpp b/src/providers/twitch/TwitchAccount.cpp index 785f159e5..cdfdf0cf3 100644 --- a/src/providers/twitch/TwitchAccount.cpp +++ b/src/providers/twitch/TwitchAccount.cpp @@ -130,7 +130,7 @@ void TwitchAccount::ignore(const QString &targetName, 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, @@ -197,7 +197,7 @@ void TwitchAccount::unignore(const QString &targetName, this->unignoreByID(targetUserId, targetName, onFinished); // }; - PartialTwitchUser::byName(this->userName_).getId(onIdFetched); + PartialTwitchUser::byName(targetName).getId(onIdFetched); } void TwitchAccount::unignoreByID(