Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Only load one OS hog file. #277

Merged
merged 1 commit into from
May 4, 2024
Merged

Conversation

MaddTheSane
Copy link
Contributor

Pull Request Type

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

Description

This prevents a dangling file pointer on macOS if a user has both d3-linux.hog and d3-osx.hog.

Related Issues

Related to #275

Checklist

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

Additional Comments

@JeodC
Copy link
Collaborator

JeodC commented May 3, 2024

I tried to resolve a conflict in init.cpp and I may have removed a endif that was supposed to be there. Sorry about that.

This prevents a dangling file pointer on macOS if a user has both d3-linux.hog and d3-osx.hog.
@MaddTheSane
Copy link
Contributor Author

Rebased and forced-pushed.

@JeodC JeodC merged commit 8b453fd into DescentDevelopers:main May 4, 2024
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants