mirror of
				https://git.suyu.dev/suyu/suyu
				synced 2025-10-31 07:59:02 -05:00 
			
		
		
		
	aoc_u: Obey disabled add-ons list when listing DLC
This commit is contained in:
		| @@ -20,6 +20,7 @@ | ||||
| #include "core/hle/service/aoc/aoc_u.h" | ||||
| #include "core/hle/service/filesystem/filesystem.h" | ||||
| #include "core/loader/loader.h" | ||||
| #include "core/settings.h" | ||||
|  | ||||
| namespace Service::AOC { | ||||
|  | ||||
| @@ -76,6 +77,13 @@ void AOC_U::CountAddOnContent(Kernel::HLERequestContext& ctx) { | ||||
|     rb.Push(RESULT_SUCCESS); | ||||
|  | ||||
|     const auto current = Core::System::GetInstance().CurrentProcess()->GetTitleID(); | ||||
|  | ||||
|     const auto& disabled = Settings::values.disabled_addons[current]; | ||||
|     if (std::find(disabled.begin(), disabled.end(), "DLC") != disabled.end()) { | ||||
|         rb.Push<u32>(0); | ||||
|         return; | ||||
|     } | ||||
|  | ||||
|     rb.Push<u32>(static_cast<u32>( | ||||
|         std::count_if(add_on_content.begin(), add_on_content.end(), | ||||
|                       [current](u64 tid) { return CheckAOCTitleIDMatchesBase(tid, current); }))); | ||||
| @@ -96,6 +104,10 @@ void AOC_U::ListAddOnContent(Kernel::HLERequestContext& ctx) { | ||||
|             out.push_back(static_cast<u32>(add_on_content[i] & 0x7FF)); | ||||
|     } | ||||
|  | ||||
|     const auto& disabled = Settings::values.disabled_addons[current]; | ||||
|     if (std::find(disabled.begin(), disabled.end(), "DLC") != disabled.end()) | ||||
|         out = {}; | ||||
|  | ||||
|     if (out.size() < offset) { | ||||
|         IPC::ResponseBuilder rb{ctx, 2}; | ||||
|         // TODO(DarkLordZach): Find the correct error code. | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Zach Hilman
					Zach Hilman