Fix conflict again

This commit is contained in:
Sebastian-byte
2021-09-12 20:52:56 -05:00
18 changed files with 83 additions and 970 deletions

View File

@@ -40,7 +40,6 @@ void LaunchController::login() {
// Find an account to use.
std::shared_ptr<AccountList> accounts = MMC->accounts();
AccountPtr account = accounts->activeAccount();
if (accounts->count() <= 0)
{
// Tell the user they need to log in at least one account in order to play.