archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-10 08:51:28 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Emu/Qt: Fix Boot Recent when using BootGame(add_only=true)

Browse source
This commit is contained in:
Megamouse 2019-01-06 23:30:38 +01:00
parent b0a24665e5
commit b639584acc
9 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rpcs3/Emu/Cell/Modules/cellMsgDialog.h
View file

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "Utilities/BitField.h" #include "Utilities/BitField.h"

3
rpcs3/Emu/System.cpp
View file

@ -607,6 +607,8 @@ bool Emulator::BootGame(const std::string& path, bool direct, bool add_only, boo
"/USRDIR/ISO.BIN.EDAT", "/USRDIR/ISO.BIN.EDAT",
}; };
m_path_old = m_path;
if (direct && fs::exists(path)) if (direct && fs::exists(path))
{ {
m_path = path; m_path = path;
@ -1126,6 +1128,7 @@ void Emulator::Load(bool add_only, bool force_global_config)
if (add_only) if (add_only)
{ {
LOG_NOTICE(LOADER, "Finished to add data to games.yml by boot for: %s", m_path); LOG_NOTICE(LOADER, "Finished to add data to games.yml by boot for: %s", m_path);
m_path = m_path_old; // Reset m_path to fix boot from gui
return; return;
} }

1
rpcs3/Emu/System.h
View file

@ -214,6 +214,7 @@ class Emulator final
atomic_t<u64> m_pause_amend_time; // increased when resumed atomic_t<u64> m_pause_amend_time; // increased when resumed
std::string m_path; std::string m_path;
std::string m_path_old;
std::string m_title_id; std::string m_title_id;
std::string m_title; std::string m_title;
std::string m_cat; std::string m_cat;

3
rpcs3/rpcs3qt/main_window.cpp
View file

@ -291,8 +291,11 @@ void main_window::Boot(const std::string& path, bool direct, bool add_only, bool
{ {
LOG_SUCCESS(LOADER, "Boot successful."); LOG_SUCCESS(LOADER, "Boot successful.");
const std::string serial = Emu.GetTitleID().empty() ? "" : "[" + Emu.GetTitleID() + "] "; const std::string serial = Emu.GetTitleID().empty() ? "" : "[" + Emu.GetTitleID() + "] ";
if (!add_only)
{
AddRecentAction(gui::Recent_Game(qstr(Emu.GetBoot()), qstr(serial + Emu.GetTitle()))); AddRecentAction(gui::Recent_Game(qstr(Emu.GetBoot()), qstr(serial + Emu.GetTitle())));
} }
}
else else
{ {
LOG_ERROR(GENERAL, "Boot failed: %s", path); LOG_ERROR(GENERAL, "Boot failed: %s", path);

2
rpcs3/rpcs3qt/main_window.h
View file

@ -1,4 +1,4 @@
#pragma once #pragma once
#ifdef _WIN32 #ifdef _WIN32
#include <QWinTaskbarProgress> #include <QWinTaskbarProgress>

2
rpcs3/rpcs3qt/msg_dialog_frame.cpp
View file

@ -1,4 +1,4 @@

#include "msg_dialog_frame.h" #include "msg_dialog_frame.h"
#include <QApplication> #include <QApplication>

2
rpcs3/rpcs3qt/msg_dialog_frame.h
View file

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "stdafx.h" #include "stdafx.h"
#include "Emu/Memory/vm.h" #include "Emu/Memory/vm.h"

2
rpcs3/rpcs3qt/progress_dialog.cpp
View file

@ -1,4 +1,4 @@
#include "progress_dialog.h" #include "progress_dialog.h"
#include <QLabel> #include <QLabel>

2
rpcs3/rpcs3qt/progress_dialog.h
View file

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "stdafx.h" #include "stdafx.h"