From 11641b5e7913a90d2428d7a3ad04b9963e9fa278 Mon Sep 17 00:00:00 2001 From: bunnei Date: Sat, 15 Nov 2014 01:08:00 -0500 Subject: Archive: Fixed to not destroy archive handle on close. --- src/core/hle/kernel/archive.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/core/hle/kernel/archive.cpp b/src/core/hle/kernel/archive.cpp index ece4cd73f..8f1c95d0f 100644 --- a/src/core/hle/kernel/archive.cpp +++ b/src/core/hle/kernel/archive.cpp @@ -100,7 +100,6 @@ public: { DEBUG_LOG(KERNEL, "Close %s %s", GetTypeName().c_str(), GetName().c_str()); CloseArchive(backend->GetIdCode()); - Kernel::g_object_pool.Destroy(GetHandle()); break; } // Unknown command... @@ -304,8 +303,9 @@ Handle OpenArchive(FileSys::Archive::IdCode id_code) { * @return Result of operation, 0 on success, otherwise error code */ Result CloseArchive(FileSys::Archive::IdCode id_code) { - if (1 != g_archive_map.erase(id_code)) { - ERROR_LOG(KERNEL, "Cannot close archive %d", (int) id_code); + auto itr = g_archive_map.find(id_code); + if (itr == g_archive_map.end()) { + ERROR_LOG(KERNEL, "Cannot close archive %d, does not exist!", (int)id_code); return -1; } -- cgit v1.2.3