RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-04 14:08:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

user_manager: megamouse fixes 3

Browse source
This commit is contained in:
Megamouse 2018-07-23 23:55:27 +02:00 • committed by Ivan
parent 9ca8ec8ec7
commit e58b7cbe1f
13 changed files with 98 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

20
rpcs3/rpcs3_app.cpp
View file

@ -72,11 +72,12 @@ void rpcs3_app::Init()
setApplicationName("RPCS3");
setWindowIcon(QIcon(":/rpcs3.ico"));
Emu.Init();
guiSettings.reset(new gui_settings());
emuSettings.reset(new emu_settings());
// Force init the emulator
InitializeEmulator(guiSettings->GetCurrentUser().toStdString(), true);
// Create the main window
RPCS3MainWin = new main_window(guiSettings, emuSettings, nullptr);
@ -113,6 +114,21 @@ void rpcs3_app::Init()
#endif
}
/** Emu.Init() wrapper for user manager */
bool rpcs3_app::InitializeEmulator(const std::string& user, bool force_init)
{
// try to set a new user
const bool user_was_set = Emu.SetUsr(user);
// only init the emulation if forced or a user was set
if (user_was_set || force_init)
{
Emu.Init();
}
return user_was_set;
}
/** RPCS3 emulator has functions it desires to call from the GUI at times. Initialize them in here.
*/
void rpcs3_app::InitializeCallbacks()