Skip to content
Browse files

[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...
1 parent f868fc4 commit c49b8eaf546069c0660f2155beb450840b0b5c8d Jim Carroll committed
Showing with 4 additions and 1 deletion.
  1. +2 −0 xbmc/interfaces/legacy/Window.cpp
  2. +2 −1 xbmc/interfaces/legacy/WindowInterceptor.h
View
2 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
View
3 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); }

0 comments on commit c49b8ea

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