File tree Expand file tree Collapse file tree 2 files changed +6
-3
lines changed Expand file tree Collapse file tree 2 files changed +6
-3
lines changed Original file line number Diff line number Diff line change @@ -61,6 +61,7 @@ gw2al_api_ret gw2al_core__unload_addon(gw2al_hashed_name name)
61
61
LOG_DEBUG (L" core" , L" Unloading addon %s" , addon->desc ->name );
62
62
63
63
unsigned short i;
64
+ bool pendingDeps = false ;
64
65
65
66
gw2al_addon** list = addonStorage.get_array (&i);
66
67
@@ -71,7 +72,6 @@ gw2al_api_ret gw2al_core__unload_addon(gw2al_hashed_name name)
71
72
--i;
72
73
continue ;
73
74
}
74
-
75
75
76
76
gw2al_addon_dsc* depList = list[i]->desc ->dependList ;
77
77
@@ -83,7 +83,7 @@ gw2al_api_ret gw2al_core__unload_addon(gw2al_hashed_name name)
83
83
if (name == gw2al_core__hash_name ((wchar_t *)depList[j].name ))
84
84
{
85
85
if (gw2al_core__unload_addon (gw2al_core__hash_name ((wchar_t *)list[i]->desc ->name )) != GW2AL_OK)
86
- return GW2AL_DEP_STILL_LOADED ;
86
+ pendingDeps = true ;
87
87
break ;
88
88
}
89
89
++j;
@@ -94,6 +94,9 @@ gw2al_api_ret gw2al_core__unload_addon(gw2al_hashed_name name)
94
94
--i;
95
95
}
96
96
97
+ if (pendingDeps)
98
+ return GW2AL_DEP_STILL_LOADED;
99
+
97
100
gw2al_api_ret ret = addon->unload (loader_core::instance.GetCurrentState () != LDR_INGAME);
98
101
99
102
if (ret == GW2AL_OK)
Original file line number Diff line number Diff line change 1
1
#pragma once
2
2
3
3
#define LOADER_CORE_VER_MAJOR 0
4
- #define LOADER_CORE_VER_MINOR 2
4
+ #define LOADER_CORE_VER_MINOR 3
5
5
#define LOADER_CORE_VER_REV BUILD_VERSION_REV
6
6
#define LOADER_CORE_VER_NAME BUILD_VERSION_NAME
You can’t perform that action at this time.
0 commit comments