Skip to content
This repository
Browse code

[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.
  • Loading branch information...
commit c49b8eaf546069c0660f2155beb450840b0b5c8d 1 parent f868fc4
authored
2  xbmc/interfaces/legacy/Window.cpp
@@ -37,6 +37,8 @@ namespace XBMCAddon
37 37
 {
38 38
   namespace xbmcgui
39 39
   {
  40
+    XbmcThreads::ThreadLocal<ref> InterceptorBase::upcallTls;
  41
+
40 42
     /**
41 43
      * Used in add/remove control. It only locks if it's given a 
42 44
      * non-NULL CCriticalSection. It's given a NULL CCriticalSection
3  xbmc/interfaces/legacy/WindowInterceptor.h
@@ -43,7 +43,8 @@ namespace XBMCAddon
43 43
     {
44 44
     protected:
45 45
       AddonClass::Ref<Window> window;
46  
-      XbmcThreads::ThreadLocal<ref> upcallTls;
  46
+      // This instance is in Window.cpp
  47
+      static XbmcThreads::ThreadLocal<ref> upcallTls;
47 48
 
48 49
       InterceptorBase() : window(NULL) { upcallTls.set(NULL); }
49 50
 

0 notes on commit c49b8ea

Please sign in to comment.
Something went wrong with that request. Please try again.