Merge lp:~thumper/nux/view-deletion-after-window-thread into lp:nux

[Tim Penhey]

This branch changes the hard dependency between views, layouts, resource data and the windows thread.

The view and layout destructors were getting traversing through the windows thread to unregister some internal stuff. However it is possible that the windows thread is destroyed before the views themselves, so they should check before attempting to call through.

The ResourceData class was also trying to go through an object that was in thread local storage. It now checks too.

[Jason Smith (jassmith)]

Looking good

review: Approve

[Jay Taoko (jaytaoko)]

review: Approve

=== modified file 'Nux/Layout.cpp'
--- Nux/Layout.cpp	2011-09-20 06:03:43 +0000
+++ Nux/Layout.cpp	2011-09-28 01:19:24 +0000
@@ -48,8 +48,11 @@
 
   Layout::~Layout()
   {
-    // It is possible that this layout object is in the refresh list. Remove it here before it is deleted.
-    GetWindowThread()->RemoveObjectFromLayoutQueue(this);
+    // It is possible that this layout object is in the refresh list. Remove
+    // it here before it is deleted.
+    WindowThread* wt = GetWindowThread();
+    if (wt)
+      wt->RemoveObjectFromLayoutQueue(this);
 
     std::list<Area *>::iterator it;
 

=== modified file 'Nux/View.cpp'
--- Nux/View.cpp	2011-09-20 06:03:43 +0000
+++ Nux/View.cpp	2011-09-28 01:19:24 +0000
@@ -49,13 +49,18 @@
 
   View::~View()
   {
-    if (GetFocused () && HasPassiveFocus() == false)
+    // It is possible that the window thread has been deleted before the view
+    // itself, so check prior to calling.
+    WindowThread* wt = GetWindowThread();
+    if (GetFocused() && HasPassiveFocus() == false && wt)
     {
-      nux::GetWindowThread ()->SetFocusedArea (NULL);
+      wt->SetFocusedArea (NULL);
     }
 
-    // It is possible that the object is in the refresh list. Remove it here before it is deleted.
-    GetWindowThread()->RemoveObjectFromLayoutQueue(this);
+    // It is possible that the object is in the refresh list. Remove it here
+    // before it is deleted.
+    if (wt)
+      wt->RemoveObjectFromLayoutQueue(this);
 
     RemoveLayout();
   }

=== modified file 'NuxGraphics/GLResourceManager.cpp'
--- NuxGraphics/GLResourceManager.cpp	2011-09-20 06:03:43 +0000
+++ NuxGraphics/GLResourceManager.cpp	2011-09-28 01:19:24 +0000
@@ -46,7 +46,11 @@
 
   ResourceData::~ResourceData ()
   {
-    GetGraphicsDisplay()->GetGraphicsEngine()->FlushCachedResourceData(this);
+    // If the windows thread is deleted before any texture type resource, the
+    // graphics display will not exist.
+    GraphicsDisplay* display = GetGraphicsDisplay();
+    if (display)
+      display->GetGraphicsEngine()->FlushCachedResourceData(this);
   }
 
   int ResourceData::GetResourceIndex() const