From f796a581c40924700413a1924b8db3f90f2c3f2b Mon Sep 17 00:00:00 2001 From: Oliver Hamlet Date: Mon, 2 Apr 2018 13:52:26 +0100 Subject: [PATCH] Update libloadorder to v11.1.0 This fixes loading a load order where loadorder.txt is encoded in Windows-1252. --- CMakeLists.txt | 2 +- src/tests/api/interface/game_interface_test.h | 1 + src/tests/api/internals/sorting/plugin_sorter_test.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index edb19b79..ceead590 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -100,7 +100,7 @@ set(LIBGIT2_LIBRARIES "${BINARY_DIR}/${CMAKE_CFG_INTDIR}/${CMAKE_STATIC_LIBRARY_ ExternalProject_Add(libloadorder PREFIX "external" - URL "https://github.com/WrinklyNinja/libloadorder/archive/11.0.2.tar.gz" + URL "https://github.com/WrinklyNinja/libloadorder/archive/11.1.0.tar.gz" CONFIGURE_COMMAND "" BUILD_IN_SOURCE 1 BUILD_COMMAND cargo build --release --all --all-features --target ${RUST_TARGET} diff --git a/src/tests/api/interface/game_interface_test.h b/src/tests/api/interface/game_interface_test.h index 5faba652..83f1def0 100644 --- a/src/tests/api/interface/game_interface_test.h +++ b/src/tests/api/interface/game_interface_test.h @@ -166,6 +166,7 @@ TEST_P(GameInterfaceTest, sortPluginsShouldSucceedIfPassedValidArguments) { pluginsToSort.push_back(blankEsl); } + handle_->LoadCurrentLoadOrderState(); std::vector actualOrder = handle_->SortPlugins(pluginsToSort); EXPECT_EQ(expectedOrder, actualOrder); diff --git a/src/tests/api/internals/sorting/plugin_sorter_test.h b/src/tests/api/internals/sorting/plugin_sorter_test.h index 2547bd61..1b01bba6 100644 --- a/src/tests/api/internals/sorting/plugin_sorter_test.h +++ b/src/tests/api/internals/sorting/plugin_sorter_test.h @@ -74,6 +74,7 @@ protected: } game_.IdentifyMainMasterFile(masterFile); + game_.LoadCurrentLoadOrderState(); game_.LoadPlugins(plugins, headersOnly); }