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

Fix load level for UE editor #4599

Merged
merged 5 commits into from
Jul 17, 2022
Merged

Fix load level for UE editor #4599

merged 5 commits into from
Jul 17, 2022

Conversation

talha-opteran
Copy link
Contributor

@talha-opteran talha-opteran commented Jul 2, 2022

Fixes: #4551
Fixes: #4601

About

Current method to load level may work for a packaged binary but does not work in the UE editor where it will infinitely load the requested level. This PR adds a check to make sure the current level is not reloaded.

How Has This Been Tested?

  1. Load project in editor.
  2. Add a "Default Environment" value in settings.json
  3. Launch AirSim.
  4. Before fix, editor freezes due to infinitely reloading requested level. After fix, new level is loaded.

Screenshots (if appropriate):

Current method to load level may work for a packaged binary but does not work in the UE editor where it will infinitely load the requested level. This PR adds a check to make sure the current level is not reloaded.
@ghost
Copy link

ghost commented Jul 2, 2022

CLA assistant check
All CLA requirements met.

@jonyMarino jonyMarino changed the base branch from master to main July 6, 2022 20:54
@jonyMarino
Copy link
Collaborator

Hi @talha-opteran ! Thanks for the contribution. I didn't debug your code, but I got the same behavior when trying to load the default environment

@talha-opteran
Copy link
Contributor Author

Added fix for #4601 as well as it is related

@jonyMarino
Copy link
Collaborator

It seems that your PR is failing the clang-format check. Please follow these steps to resolve this:

  1. check out your pull request

  2. run git checkout master .clang-format in your repo's root folder

  3. if you don't have npm installed, download it from https://www.npmjs.com/get-npm

  4. run npm install -g clang-format

  5. run clang-format -i path/to/file for each failing file (failing files can be found in the details for the clang-format check)

  6. run git add -u to track all style changes

  7. run git commit -am "apply style from clang-format"

  8. run git merge master

  9. resolve other non-style conflicts if you have any

  10. push changes

Thanks for contributing to AirSim!

@ziminia ziminia mentioned this pull request Jul 16, 2022
@jonyMarino
Copy link
Collaborator

Thanks!

@jonyMarino jonyMarino merged commit efe2d23 into microsoft:main Jul 17, 2022
@talha-opteran talha-opteran deleted the patch-1 branch July 18, 2022 08:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

AirSim/PX4 crashes when using non-default environment from settings.json
2 participants