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

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
+1 -1
View File
@@ -1,4 +1,4 @@
#pragma once
#pragma once
#include "Utilities/BitField.h"
+3
View File
@@ -607,6 +607,8 @@ bool Emulator::BootGame(const std::string& path, bool direct, bool add_only, boo
"/USRDIR/ISO.BIN.EDAT",
};
m_path_old = m_path;
if (direct && fs::exists(path))
{
m_path = path;
@@ -1126,6 +1128,7 @@ void Emulator::Load(bool add_only, bool force_global_config)
if (add_only)
{
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;
}
+1
View File
@@ -214,6 +214,7 @@ class Emulator final
atomic_t<u64> m_pause_amend_time; // increased when resumed
std::string m_path;
std::string m_path_old;
std::string m_title_id;
std::string m_title;
std::string m_cat;
+4 -1
View File
@@ -291,7 +291,10 @@ void main_window::Boot(const std::string& path, bool direct, bool add_only, bool
{
LOG_SUCCESS(LOADER, "Boot successful.");
const std::string serial = Emu.GetTitleID().empty() ? "" : "[" + Emu.GetTitleID() + "] ";
AddRecentAction(gui::Recent_Game(qstr(Emu.GetBoot()), qstr(serial + Emu.GetTitle())));
if (!add_only)
{
AddRecentAction(gui::Recent_Game(qstr(Emu.GetBoot()), qstr(serial + Emu.GetTitle())));
}
}
else
{
+1 -1
View File
@@ -1,4 +1,4 @@
#pragma once
#pragma once
#ifdef _WIN32
#include <QWinTaskbarProgress>
+1 -1
View File
@@ -1,4 +1,4 @@
#include "msg_dialog_frame.h"
#include <QApplication>
+1 -1
View File
@@ -1,4 +1,4 @@
#pragma once
#pragma once
#include "stdafx.h"
#include "Emu/Memory/vm.h"
+1 -1
View File
@@ -1,4 +1,4 @@
#include "progress_dialog.h"
#include "progress_dialog.h"
#include <QLabel>
+1 -1
View File
@@ -1,4 +1,4 @@
#pragma once
#pragma once
#include "stdafx.h"