diff --git a/rpcs3/rpcs3qt/gui_application.cpp b/rpcs3/rpcs3qt/gui_application.cpp index febe8b3b65..51d80a4534 100644 --- a/rpcs3/rpcs3qt/gui_application.cpp +++ b/rpcs3/rpcs3qt/gui_application.cpp @@ -67,11 +67,8 @@ bool gui_application::Init() // The user might be set by cli arg. If not, set another user. if (m_active_user.empty()) { - // Get deprecated active user (before August 2nd 2020) - const QString active_user = m_gui_settings->GetValue(gui::um_active_user).toString(); - - // Get active user with deprecated active user as fallback - m_active_user = m_persistent_settings->GetCurrentUser(active_user.isEmpty() ? "00000001" : active_user).toStdString(); + // Get active user with standard user as fallback + m_active_user = m_persistent_settings->GetCurrentUser("00000001").toStdString(); } // Force init the emulator diff --git a/rpcs3/rpcs3qt/gui_settings.h b/rpcs3/rpcs3qt/gui_settings.h index 308d288759..cd852f64bb 100644 --- a/rpcs3/rpcs3qt/gui_settings.h +++ b/rpcs3/rpcs3qt/gui_settings.h @@ -230,7 +230,6 @@ namespace gui const gui_save sd_icon_color = gui_save(savedata, "icon_color", gl_icon_color); const gui_save um_geometry = gui_save(users, "geometry", QByteArray()); - const gui_save um_active_user = gui_save(users, "active_user", ""); // Deprecated const gui_save loc_language = gui_save(localization, "language", "en"); diff --git a/rpcs3/rpcs3qt/persistent_settings.cpp b/rpcs3/rpcs3qt/persistent_settings.cpp index b6c5b87aba..28d5bbb84a 100644 --- a/rpcs3/rpcs3qt/persistent_settings.cpp +++ b/rpcs3/rpcs3qt/persistent_settings.cpp @@ -1,6 +1,7 @@ #include "persistent_settings.h" #include "util/logs.hpp" +#include "Emu/System.h" LOG_CHANNEL(cfg_log, "CFG"); @@ -47,15 +48,12 @@ QString persistent_settings::GetCurrentUser(const QString& fallback) const user = fallback; } - bool is_valid_user; - const u32 user_id = user.toInt(&is_valid_user); - // Set user if valid - if (is_valid_user && user_id > 0) + if (Emulator::CheckUsr(user.toStdString()) > 0) { return user; } - cfg_log.fatal("Could not parse user setting: '%s' = '%d'.", user.toStdString(), user_id); + cfg_log.fatal("Could not parse user setting: '%s'.", user.toStdString()); return QString(); } diff --git a/rpcs3/rpcs3qt/user_manager_dialog.cpp b/rpcs3/rpcs3qt/user_manager_dialog.cpp index 6b9eaa4c46..df70f14922 100644 --- a/rpcs3/rpcs3qt/user_manager_dialog.cpp +++ b/rpcs3/rpcs3qt/user_manager_dialog.cpp @@ -88,19 +88,8 @@ void user_manager_dialog::Init() vbox_main->addLayout(hbox_buttons); setLayout(vbox_main); - m_active_user = m_persistent_settings->GetValue(gui::persistent::active_user).toString().toStdString(); - - // Handle deprecated value (before August 2nd 2020) - if (m_active_user.empty()) - { - m_active_user = m_gui_settings->GetValue(gui::um_active_user).toString().toStdString(); - m_gui_settings->RemoveValue(gui::um_active_user); - - if (!m_active_user.empty()) - { - m_persistent_settings->SetValue(gui::persistent::active_user, qstr(m_active_user)); - } - } + // Get the active user + m_active_user = m_persistent_settings->GetCurrentUser("00000001").toStdString(); // Get the real active user (might differ, set by cli) if (m_active_user != Emu.GetUsr())