Fixed access of map::iterator to recently deleted element

[pzychotic]

Pull Request Type

• [ ] GitHub Workflow changes
• [ ] Documentation or Wiki changes
• [ ] Build and Dependency changes
• [x] Runtime changes
  • [ ] Render changes
  • [ ] Audio changes
  • [ ] Input changes
  • [ ] Network changes
  • [x] Other changes

Description

Deleting an element from a std::map invalidates the iterator to that element. So trying to continue the loop will lead to bad things. Fortunately map::erase() returns an iterator to the next element that we can assign to it to correctly continue the loop. Also removed a left over cast of basename to std::filesystem::path.

Related Issues

Fixes #604

Screenshots (if applicable)

Checklist

• [x] I have tested my changes locally and verified that they work as intended.
• [x] I have documented any new or modified functionality.
• [x] I have reviewed the changes to ensure they do not introduce any unnecessary complexity or duplicate code.
• [x] I understand that by submitting this pull request, I am agreeing to license my contributions under the project's license.

Additional Comments

[sebholt]

This fixes the invalid iterator usage.

But doesn't this skip the element after the erase because the for loop increments the iterator right after the erase?

This feels more correct to me

  for (auto it = OSIRIS_Extracted_scripts.begin(); it != OSIRIS_Extracted_scripts.end();) {
    if (mission_only && (!(it->second.flags & OESF_MISSION))) {
       ++it;
    } else {
      std::filesystem::remove(OSIRIS_Extracted_script_dir / it->second.temp_filename);
      it = OSIRIS_Extracted_scripts.erase(it);
    }
  }

[pzychotic]

Ups! Of course, you're right. Thanks for the catch!

[winterheart]

Always failing on deleting iterator... Thanks for reporting to @Jayman2000 and proposed fix. Retested on Windows for sure.