auto merge of servo#1093 : larsbergstrom/servo/shutdown_window_destruction, r=metajack

bors-servo · bors-servo · commit f27410602969 · 2013-10-21T08:46:01.000-07:00
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.
diff --git 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();
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,8 @@ impl ApplicationMethods for Application {`
`39`	`39`
`40`	`40`	`impl Drop for Application {`
`41`	`41`	`fn drop(&self) {`
`42`		`- glfw::terminate();`
`43`	`42`	`drop_local_window();`
	`43`	`+ glfw::terminate();`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`