OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-12-18 06:50:04 +00:00
Code Issues Projects Releases Wiki Activity

Fix self updating ncch app jump

Browse Source
This commit is contained in:
PabloMK7 2022-10-21 01:12:29 +02:00
parent c49379442d
commit d396944487
5 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/file_util.cpp
View File

@ -738,10 +738,6 @@ void SetCurrentRomPath(const std::string& path) {
g_currentRomPath = path;
}
const std::string& GetCurrentRomPath() {
return g_currentRomPath;
}
bool StringReplace(std::string& haystack, const std::string& a, const std::string& b, bool swap) {
const auto& needle = swap ? b : a;
const auto& replacement = swap ? a : b;

2
src/common/file_util.h
View File

@ -182,8 +182,6 @@ void SetUserPath(const std::string& path = "");
void SetCurrentRomPath(const std::string& path);
const std::string& GetCurrentRomPath();
// Returns a pointer to a string with a Citra data dir in the user's home
// directory. To be used in "multi-user" mode (that is, installed).
[[nodiscard]] const std::string& GetUserPath(UserPath path);

18
src/core/core.cpp
View File

@ -31,6 +31,7 @@
#include "core/hle/kernel/kernel.h"
#include "core/hle/kernel/process.h"
#include "core/hle/kernel/thread.h"
#include "core/hle/service/am/am.h"
#include "core/hle/service/apt/applet_manager.h"
#include "core/hle/service/apt/apt.h"
#include "core/hle/service/fs/archive.h"
@ -575,8 +576,25 @@ void System::Reset() {
deliver_arg = apt->GetAppletManager()->ReceiveDeliverArg();
}
bool was_self_delete_pending = self_delete_pending;
Shutdown();
// Self updating apps may launch themselves after the update, if that's the case
// find the new path to launch.
if (was_self_delete_pending) {
// TODO: We can get the title id, but not the MediaType, so we
// check both NAND and SDMC mediatypes.
m_filepath = Service::AM::GetTitleContentPath(Service::FS::MediaType::NAND, title_id);
if (m_filepath.empty() || !FileUtil::Exists(m_filepath)) {
m_filepath = Service::AM::GetTitleContentPath(Service::FS::MediaType::SDMC, title_id);
if (m_filepath.empty() || !FileUtil::Exists(m_filepath)) {
LOG_CRITICAL(Core, "Failed to get application path for system reset");
return;
}
}
}
// Reload the system with the same setting
[[maybe_unused]] const System::ResultStatus result = Load(*m_emu_window, m_filepath);

7
src/core/core.h
View File

@ -306,9 +306,12 @@ public:
void LoadState(u32 slot);
/// Self delete ncch
void SetSelfDelete(const std::string& file) {
if (m_filepath == file)
bool SetSelfDelete(const std::string& file) {
if (m_filepath == file) {
self_delete_pending = true;
return true;
}
return false;
}
private:

11
src/core/hle/service/am/am.cpp
View File

@ -318,12 +318,13 @@ bool CIAFile::Close() const {
if (abort)
break;
// Try deleting the file, if it fails it's because it's the currently running file
// and we are on windows. In that case, let system know to delete the currently
// running file once it shuts down.
// If the file to delete is the current launched rom, signal the system to delete
// the current rom instead of deleting it now, once all the handles to the file
// are closed.
std::string toDelete = GetTitleContentPath(media_type, old_tmd.GetTitleID(), old_index);
if (!FileUtil::Delete(toDelete) && FileUtil::GetCurrentRomPath() == toDelete)
Core::System::GetInstance().SetSelfDelete(toDelete);
if (!(Core::System::GetInstance().IsPoweredOn() &&
Core::System::GetInstance().SetSelfDelete(toDelete)))
FileUtil::Delete(toDelete);
}
FileUtil::Delete(old_tmd_path);