dahjah/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2026-06-03 22:45:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Assert on attempting to login the same user for two different slots (#4421)

Browse Source
This commit is contained in:
kalaposfos13 2026-05-15 11:50:28 +02:00 committed by GitHub
parent 40237afd1d
commit 50d33b4dbf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/user_manager.cpp
View File

@ -3,6 +3,7 @@
#include <filesystem> #include <filesystem>
#include <iostream> #include <iostream>
#include <common/assert.h>
#include <common/path_util.h> #include <common/path_util.h>
#include "emulator_settings.h" #include "emulator_settings.h"
#include "libraries/system/userservice.h" #include "libraries/system/userservice.h"
@ -199,10 +200,15 @@ void UserManager::LoginUser(User* u, s32 player_index) {
return; return;
} }
// if a controller triggers a login event for an already logged in user for the same index (e.g.
// the primary user is logged on at boot, with no controllers being connected at that time, then
// a controller is connected, triggering another login for the first user), do nothing
if (logged_in_users[player_index - 1] == u) {
return;
}
// if the same user is attempted to be registered in two different slots, crash
for (auto& logged_in_user : logged_in_users) { for (auto& logged_in_user : logged_in_users) {
if (logged_in_user == u) { ASSERT(logged_in_user != u);
logged_in_user = nullptr;
}
} }
u->logged_in = true; u->logged_in = true;