diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/file_sys/disk_filesystem.cpp | 6 | ||||
| -rw-r--r-- | src/core/hle/kernel/hle_ipc.cpp | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/core/file_sys/disk_filesystem.cpp b/src/core/file_sys/disk_filesystem.cpp index 8c6f15bb5..d248c2df4 100644 --- a/src/core/file_sys/disk_filesystem.cpp +++ b/src/core/file_sys/disk_filesystem.cpp @@ -58,11 +58,13 @@ ResultVal<std::unique_ptr<StorageBackend>> Disk_FileSystem::OpenFile(const std:: } ResultCode Disk_FileSystem::DeleteFile(const std::string& path) const { - if (!FileUtil::Exists(path)) { + std::string full_path = base_directory + path; + + if (!FileUtil::Exists(full_path)) { return ERROR_PATH_NOT_FOUND; } - FileUtil::Delete(path); + FileUtil::Delete(full_path); return RESULT_SUCCESS; } diff --git a/src/core/hle/kernel/hle_ipc.cpp b/src/core/hle/kernel/hle_ipc.cpp index 609cdbff2..2532dd450 100644 --- a/src/core/hle/kernel/hle_ipc.cpp +++ b/src/core/hle/kernel/hle_ipc.cpp @@ -214,8 +214,8 @@ ResultCode HLERequestContext::WriteToOutgoingCommandBuffer(Thread& thread) { (sizeof(IPC::CommandHeader) + sizeof(IPC::HandleDescriptorHeader)) / sizeof(u32); ASSERT_MSG(!handle_descriptor_header->send_current_pid, "Sending PID is not implemented"); - ASSERT_MSG(copy_objects.size() == handle_descriptor_header->num_handles_to_copy); - ASSERT_MSG(move_objects.size() == handle_descriptor_header->num_handles_to_move); + ASSERT(copy_objects.size() == handle_descriptor_header->num_handles_to_copy); + ASSERT(move_objects.size() == handle_descriptor_header->num_handles_to_move); // We don't make a distinction between copy and move handles when translating since HLE // services don't deal with handles directly. However, the guest applications might check |