[fix] It appears that we were running out of Tls on windows. This cha…

…nges the addon system so that a single one is created for the Interceptor functionality rather than one per window.
jimfcarroll · Dec 31, 2012 · c49b8ea · c49b8ea
1 parent f868fc4
commit c49b8ea
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/xbmc/interfaces/legacy/Window.cpp b/xbmc/interfaces/legacy/Window.cpp
@@ -37,6 +37,8 @@ namespace XBMCAddon
 {
   namespace xbmcgui
   {
+    XbmcThreads::ThreadLocal<ref> InterceptorBase::upcallTls;
+
     /**
      * Used in add/remove control. It only locks if it's given a 
      * non-NULL CCriticalSection. It's given a NULL CCriticalSection

diff --git a/xbmc/interfaces/legacy/WindowInterceptor.h b/xbmc/interfaces/legacy/WindowInterceptor.h
@@ -43,7 +43,8 @@ namespace XBMCAddon
     {
     protected:
       AddonClass::Ref<Window> window;
-      XbmcThreads::ThreadLocal<ref> upcallTls;
+      // This instance is in Window.cpp
+      static XbmcThreads::ThreadLocal<ref> upcallTls;
 
       InterceptorBase() : window(NULL) { upcallTls.set(NULL); }