loot/libloot
0
0
Fork 0
mirror of https://github.com/loot/libloot.git synced 2026-07-27 14:16:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Handle libloadorder warnings appropriately.

Browse Source
This commit is contained in:
Oliver Hamlet
2014-10-29 11:49:35 +00:00
parent d490d6686d
commit 41cbdf2a51
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/backend/game.cpp
+9 -5
View File
@@ -487,7 +487,7 @@ namespace loot {
else
ret = LIBLO_ERROR_INVALID_ARGS;
if (ret != LIBLO_OK && ret != LIBLO_WARN_LO_MISMATCH) {
if (ret != LIBLO_OK && ret != LIBLO_WARN_BAD_FILENAME && ret != LIBLO_WARN_INVALID_LIST && ret != LIBLO_WARN_LO_MISMATCH) {
const char * e = nullptr;
string err;
lo_get_error_message(&e);
@@ -504,7 +504,8 @@ namespace loot {
}
if (id != Game::tes5) {
if (lo_set_game_master(gh, _masterFile.c_str()) != LIBLO_OK) {
ret = lo_set_game_master(gh, _masterFile.c_str());
if (ret != LIBLO_OK && ret != LIBLO_WARN_BAD_FILENAME && ret != LIBLO_WARN_INVALID_LIST && ret != LIBLO_WARN_LO_MISMATCH) {
const char * e = nullptr;
string err;
lo_get_error_message(&e);
@@ -528,7 +529,8 @@ namespace loot {
char ** pluginArr;
size_t pluginArrSize;
if (lo_get_active_plugins(gh, &pluginArr, &pluginArrSize) != LIBLO_OK) {
unsigned int ret = lo_get_active_plugins(gh, &pluginArr, &pluginArrSize);
if (ret != LIBLO_OK && ret != LIBLO_WARN_BAD_FILENAME && ret != LIBLO_WARN_INVALID_LIST && ret != LIBLO_WARN_LO_MISMATCH) {
const char * e = nullptr;
string err;
lo_get_error_message(&e);
@@ -561,7 +563,8 @@ namespace loot {
char ** pluginArr;
size_t pluginArrSize;
if (lo_get_load_order(gh, &pluginArr, &pluginArrSize) != LIBLO_OK) {
unsigned int ret = lo_get_load_order(gh, &pluginArr, &pluginArrSize);
if (ret != LIBLO_OK && ret != LIBLO_WARN_BAD_FILENAME && ret != LIBLO_WARN_INVALID_LIST && ret != LIBLO_WARN_LO_MISMATCH) {
const char * e = nullptr;
string err;
lo_get_error_message(&e);
@@ -587,7 +590,8 @@ namespace loot {
void Game::SetLoadOrder(const char * const * const loadOrder, const size_t numPlugins) const {
BOOST_LOG_TRIVIAL(debug) << "Setting load order for game: " << _name;
if (lo_set_load_order(gh, loadOrder, numPlugins) != LIBLO_OK) {
unsigned int ret = lo_set_load_order(gh, loadOrder, numPlugins);
if (ret != LIBLO_OK && ret != LIBLO_WARN_BAD_FILENAME && ret != LIBLO_WARN_INVALID_LIST && ret != LIBLO_WARN_LO_MISMATCH) {
const char * e = nullptr;
string err;
lo_get_error_message(&e);