liamwhite
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with
6 additions and
2 deletions
-
externals/nx_tzdb/CMakeLists.txt
-
externals/nx_tzdb/NxTzdbCreateHeader.cmake
-
src/hid_core/resources/abstracted_pad/abstract_properties_handler.cpp
|
|
|
@ -32,7 +32,7 @@ set(NX_TZDB_ARCHIVE "${CMAKE_CURRENT_BINARY_DIR}/${NX_TZDB_VERSION}.zip") |
|
|
|
|
|
|
|
set(NX_TZDB_ROMFS_DIR "${CMAKE_CURRENT_BINARY_DIR}/nx_tzdb") |
|
|
|
|
|
|
|
if ((NOT CAN_BUILD_NX_TZDB OR YUZU_DOWNLOAD_TIME_ZONE_DATA) AND NOT EXISTS ${NX_TZDB_ARCHIVE}) |
|
|
|
if ((NOT CAN_BUILD_NX_TZDB OR YUZU_DOWNLOAD_TIME_ZONE_DATA) AND NOT EXISTS ${NX_TZDB_ROMFS_DIR}) |
|
|
|
set(NX_TZDB_DOWNLOAD_URL "https://github.com/lat9nq/tzdb_to_nx/releases/download/${NX_TZDB_VERSION}/${NX_TZDB_VERSION}.zip") |
|
|
|
|
|
|
|
message(STATUS "Downloading time zone data from ${NX_TZDB_DOWNLOAD_URL}...") |
|
|
|
|
|
|
|
@ -11,6 +11,10 @@ execute_process( |
|
|
|
WORKING_DIRECTORY ${ZONE_PATH} |
|
|
|
OUTPUT_VARIABLE FILE_LIST) |
|
|
|
|
|
|
|
if (NOT FILE_LIST) |
|
|
|
message(FATAL_ERROR "No timezone files found in directory ${ZONE_PATH}, did the download fail?") |
|
|
|
endif() |
|
|
|
|
|
|
|
set(DIRECTORY_NAME ${HEADER_NAME}) |
|
|
|
|
|
|
|
set(FILE_DATA "") |
|
|
|
|
|
|
|
@ -137,7 +137,7 @@ void NpadAbstractPropertiesHandler::UpdateAllDeviceProperties() { |
|
|
|
const auto npad_index = NpadIdTypeToIndex(npad_id_type); |
|
|
|
for (std::size_t aruid_index = 0; aruid_index < AruidIndexMax; aruid_index++) { |
|
|
|
auto* data = applet_resource_holder->applet_resource->GetAruidData(aruid_index); |
|
|
|
if (!data->flag.is_assigned) { |
|
|
|
if (data == nullptr || !data->flag.is_assigned) { |
|
|
|
continue; |
|
|
|
} |
|
|
|
auto& npad_entry = data->shared_memory_format->npad.npad_entry[npad_index]; |
|
|
|
|
