Skip to content

Commit

Permalink
Merge branch 'fixes' into feature
Browse files Browse the repository at this point in the history
  • Loading branch information
arch1t3cht committed Sep 17, 2023
2 parents 8fb8e90 + edae653 commit 61ec2bc
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions src/auto4_base.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -316,11 +316,14 @@ namespace Automation4 {

std::vector<std::future<std::unique_ptr<Script>>> script_futures;

auto path_it = agi::Split(path, '|');
for (auto tok : std::set<agi::StringRange>(begin(path_it), end(path_it))) {
std::set<agi::fs::path> dirnames;
for (auto tok : agi::Split(path, '|')) {
auto dirname = config::path->Decode(agi::str(tok));
if (!agi::fs::DirectoryExists(dirname)) continue;

if (dirnames.count(dirname)) continue;
dirnames.insert(dirname);

for (auto filename : agi::fs::DirectoryIterator(dirname, "*.*"))
script_futures.emplace_back(std::async(std::launch::async, [=] {
return ScriptFactory::CreateFromFile(dirname/filename, false, false);
Expand Down

0 comments on commit 61ec2bc

Please sign in to comment.