cleanup ContentControl

This commit is contained in:
MihailRis
2025-04-02 15:01:24 +03:00
parent f99d909f34
commit 3486cbd4c9
10 changed files with 59 additions and 114 deletions
+2 -8
View File
@@ -324,12 +324,10 @@ void EngineController::reconfigPacks(
}
}
runnable removeFunc = [this, controller, packsToAdd, packsToRemove]() {
runnable removeFunc = [this, controller, packsToAdd, packsToRemove, &contentControl]() {
auto& manager = contentControl.scan();
if (controller == nullptr) {
try {
PacksManager manager;
manager.setSources(engine.getContentControl().getDefaultSources());
manager.scan();
auto names = PacksManager::getNames(
engine.getContentControl().getContentPacks()
);
@@ -352,10 +350,6 @@ void EngineController::reconfigPacks(
auto& wfile = *world->wfile;
controller->saveWorld();
PacksManager manager;
manager.setSources(engine.getContentControl().getDefaultSources());
manager.scan();
auto names = PacksManager::getNames(world->getPacks());
for (const auto& id : packsToAdd) {
names.push_back(id);