From b9a0c107abde35b6deff2eafeb2b26c336c639f7 Mon Sep 17 00:00:00 2001
From: Nekotekina <nekotekina@gmail.com>
Date: Wed, 20 Sep 2017 12:56:01 +0300
Subject: [PATCH] Fix library loading mode 'both'

---
 rpcs3/Emu/Cell/PPUModule.cpp   |  4 ++--
 rpcs3/Emu/Cell/lv2/sys_prx.cpp | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/rpcs3/Emu/Cell/PPUModule.cpp b/rpcs3/Emu/Cell/PPUModule.cpp
index 4ed70a340f..a5578f1452 100644
--- a/rpcs3/Emu/Cell/PPUModule.cpp
+++ b/rpcs3/Emu/Cell/PPUModule.cpp
@@ -1178,9 +1178,9 @@ void ppu_load_exec(const ppu_exec_object& elf)
 	// Get LLE module list
 	std::set<std::string> load_libs;
 
-	if (g_cfg.core.lib_loading == lib_loading_type::manual || g_cfg.core.lib_loading == lib_loading_type::both)
+	if (g_cfg.core.lib_loading == lib_loading_type::manual)
 	{
-		// Load required set of modules
+		// Load required set of modules (lib_loading_type::both processed in sys_prx.cpp)
 		load_libs = g_cfg.core.load_libraries.get_set();
 	}
 	else if (g_cfg.core.lib_loading == lib_loading_type::liblv2only)
diff --git a/rpcs3/Emu/Cell/lv2/sys_prx.cpp b/rpcs3/Emu/Cell/lv2/sys_prx.cpp
index 58b2cd680e..88edbd2757 100644
--- a/rpcs3/Emu/Cell/lv2/sys_prx.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_prx.cpp
@@ -107,7 +107,18 @@ error_code prx_load_module(const std::string& vpath, u64 flags, vm::ptr<sys_prx_
 		return CELL_PRX_ERROR_LIBRARY_FOUND;
 	}
 
-	if (s_prx_ignore.count(vpath))
+	bool ignore = s_prx_ignore.count(vpath) != 0;
+
+	if (ignore && g_cfg.core.lib_loading == lib_loading_type::both)
+	{
+		// Ignore ignore list if the library is selected in 'both' mode
+		if (g_cfg.core.load_libraries.get_set().count(name) != 0)
+		{
+			ignore = false;
+		}
+	}
+
+	if (ignore)
 	{
 		sys_prx.warning("Ignored module: %s", vpath);