mirror of
https://github.com/servo/servo.git
synced 2025-07-18 21:03:45 +01:00
Auto merge of #22094 - asajeffrey:magicleap-shutdown, r=paulrouget
Shut down Servo when the ML app quits <!-- Please describe your changes on the following line: --> Shut down servo when shutting down the magic leap app. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes do not require tests because we don't test ML <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22094) <!-- Reviewable:end -->
This commit is contained in:
commit
e265fcfc3c
2 changed files with 27 additions and 5 deletions
|
@ -59,8 +59,6 @@ Servo2D::Servo2D() {
|
|||
// Destroy a Servo 2D instance
|
||||
Servo2D::~Servo2D() {
|
||||
ML_LOG(Debug, "Servo2D Destructor.");
|
||||
discard_servo(servo_);
|
||||
servo_ = nullptr;
|
||||
}
|
||||
|
||||
// The prism dimensions
|
||||
|
@ -168,6 +166,8 @@ int Servo2D::init() {
|
|||
|
||||
int Servo2D::deInit() {
|
||||
ML_LOG(Debug, "Servo2D Deinitializing.");
|
||||
discard_servo(servo_);
|
||||
servo_ = nullptr;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue