Skip to content

Commit

Permalink
We were removing the Window from TLS and thus destroying it after ter…
Browse files Browse the repository at this point in the history
…minating the

windowing system, which caused an error due to calling a glfw function when it
was not inititalized.
  • Loading branch information
larsbergstrom committed Oct 19, 2013
1 parent 8f7f70c commit 8e669a3
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/components/main/platform/common/glfw_windowing.rs
Expand Up @@ -39,8 +39,8 @@ impl ApplicationMethods for Application {

impl Drop for Application {
fn drop(&self) {
glfw::terminate();
drop_local_window();
glfw::terminate();
}
}

Expand Down

9 comments on commit 8e669a3

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from metajack
at larsbergstrom@8e669a3

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging larsbergstrom/servo/shutdown_window_destruction = 8e669a3 into auto

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

larsbergstrom/servo/shutdown_window_destruction = 8e669a3 merged ok, testing candidate = 6d0066a

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from metajack
at larsbergstrom@8e669a3

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging larsbergstrom/servo/shutdown_window_destruction = 8e669a3 into auto

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

larsbergstrom/servo/shutdown_window_destruction = 8e669a3 merged ok, testing candidate = f274106

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = f274106

Please sign in to comment.