Skip to content

Commit

Permalink
hotfixes
Browse files Browse the repository at this point in the history
  • Loading branch information
DeltaGW2 committed Jun 10, 2024
1 parent dfa8984 commit 5b9b8a7
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 40 deletions.
1 change: 0 additions & 1 deletion src/GUI/Widgets/Addons/AddonItem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ namespace GUI
}
}


if (!BtnOptions) { BtnOptions = TextureLoader::GetOrCreate("ICON_OPTIONS", RES_ICON_OPTIONS, NexusHandle); }
if (!CtxMenuBullet) { CtxMenuBullet = TextureLoader::GetOrCreate("TEX_CTXMENU_BULLET", RES_TEX_CONTEXTMENU_BULLET, NexusHandle); }
if (!CtxMenuHighlight) { CtxMenuHighlight = TextureLoader::GetOrCreate("TEX_CTXMENU_HIGHLIGHT", RES_TEX_CONTEXTMENU_HIGHLIGHT, NexusHandle); }
Expand Down
38 changes: 0 additions & 38 deletions src/Loader/Loader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -506,42 +506,6 @@ namespace Loader
LogDebug(CH_LOADER, "%s", fErr.what());
}
}
else if (path.extension() == extOld)
{
std::filesystem::path actualPath = path.string().substr(0, path.string().length() - extOld.length());

Addon* addon = FindAddonByPath(actualPath);

/* not orphaned, will be handled by loader */
if (addon) { continue; }

try
{
std::filesystem::remove(path);
}
catch (std::filesystem::filesystem_error fErr)
{
LogDebug(CH_LOADER, "%s", fErr.what());
}
}
else if (path.extension() == extUpdate)
{
std::filesystem::path actualPath = path.string().substr(0, path.string().length() - extUpdate.length());

Addon* addon = FindAddonByPath(actualPath);

/* not orphaned, will be handled by loader */
if (addon) { continue; }

try
{
std::filesystem::rename(path, actualPath);
}
catch (std::filesystem::filesystem_error fErr)
{
LogDebug(CH_LOADER, "%s", fErr.what());
}
}
}

IsSuspended = true;
Expand Down Expand Up @@ -846,8 +810,6 @@ namespace Loader
Events::Raise(EV_ADDON_LOADED, &addon->Definitions->Signature);
Events::Raise(EV_MUMBLE_IDENTITY_UPDATED, Mumble::IdentityParsed);

SortAddons();

addon->State = locked ? EAddonState::LoadedLOCKED : EAddonState::Loaded;
SaveAddonConfig();

Expand Down
2 changes: 1 addition & 1 deletion src/Updater/Updater.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ bool CUpdater::InstallAddon(LibraryAddon* aAddon, bool aIsArcPlugin)
std::filesystem::path installPath = Path::D_GW2_ADDONS / (filename + ".dll");
installPath = GetUnclaimedPath(installPath);

if (this->UpdateAddon(installPath, addonInfo, true))
if (this->UpdateAddon(installPath, addonInfo, aIsArcPlugin))
{
try
{
Expand Down

0 comments on commit 5b9b8a7

Please sign in to comment.