diff options
| author | bors-servo <release+servo@mozilla.com> | 2013-10-21 08:46:01 -0700 |
|---|---|---|
| committer | bors-servo <release+servo@mozilla.com> | 2013-10-21 08:46:01 -0700 |
| commit | f27410602969fd1db5b3b9ce902d1b9f58bdad2e (patch) | |
| tree | f183866b1dbae97dcefe0d14f8a220d2437e7ba6 | |
| parent | accec9c113e85f285e69149413944a94d507f75b (diff) | |
| parent | 8e669a3ed57b8d42761032843a1c64bda3699eb4 (diff) | |
| download | servo-f27410602969fd1db5b3b9ce902d1b9f58bdad2e.tar.gz servo-f27410602969fd1db5b3b9ce902d1b9f58bdad2e.zip | |
auto merge of #1093 : larsbergstrom/servo/shutdown_window_destruction, r=metajack
We were removing the Window from TLS and thus destroying it after terminating the windowing system, which caused an error due to calling a glfw function when it was not inititalized.
| -rw-r--r-- | src/components/main/platform/common/glfw_windowing.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/main/platform/common/glfw_windowing.rs b/src/components/main/platform/common/glfw_windowing.rs index 60eaa421c6c..d257439b85f 100644 --- a/src/components/main/platform/common/glfw_windowing.rs +++ b/src/components/main/platform/common/glfw_windowing.rs @@ -39,8 +39,8 @@ impl ApplicationMethods for Application { impl Drop for Application { fn drop(&self) { - glfw::terminate(); drop_local_window(); + glfw::terminate(); } } |