Merge pull request #15310 from linknetx/active-skin-update

Active Skin Update - Force Close TextureBundle
xbmc · Jan 26, 2019 · f4aef1c · f4aef1c
2 parents ed443c9 + f1ce615
commit f4aef1c
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 2 deletions.
diff --git a/xbmc/addons/Skin.cpp b/xbmc/addons/Skin.cpp
@@ -392,6 +392,9 @@ const INFO::CSkinVariableString* CSkinInfo::CreateSkinVariable(const std::string
 
 void CSkinInfo::OnPreInstall()
 {
+  bool skinLoaded = g_SkinInfo != nullptr;
+  if (IsInUse() && skinLoaded)
+    CApplicationMessenger::GetInstance().SendMsg(TMSG_EXECUTE_BUILT_IN, -1, -1, nullptr, "UnloadSkin");
 }
 
 void CSkinInfo::OnPostInstall(bool update, bool modal)

diff --git a/xbmc/guilib/TextureBundle.cpp b/xbmc/guilib/TextureBundle.cpp
@@ -66,6 +66,11 @@ int CTextureBundle::LoadAnim(const std::string& Filename, CBaseTexture*** ppText
   return 0;
 }
 
+void CTextureBundle::Close()
+{
+  m_tbXBT.CloseBundle();
+}
+
 void CTextureBundle::SetThemeBundle(bool themeBundle)
 {
   m_tbXBT.SetThemeBundle(themeBundle);

diff --git a/xbmc/guilib/TextureBundle.h b/xbmc/guilib/TextureBundle.h
@@ -27,7 +27,7 @@ class CTextureBundle
   bool LoadTexture(const std::string& Filename, CBaseTexture** ppTexture, int &width, int &height);
 
   int LoadAnim(const std::string& Filename, CBaseTexture*** ppTextures, int &width, int &height, int& nLoops, int** ppDelays);
-
+  void Close();
 private:
   CTextureBundleXBT m_tbXBT;
 

diff --git a/xbmc/guilib/TextureBundleXBT.cpp b/xbmc/guilib/TextureBundleXBT.cpp
@@ -45,6 +45,11 @@ CTextureBundleXBT::CTextureBundleXBT(bool themeBundle)
 }
 
 CTextureBundleXBT::~CTextureBundleXBT(void)
+{
+  CloseBundle();
+}
+
+void CTextureBundleXBT::CloseBundle()
 {
   if (m_XBTFReader != nullptr && m_XBTFReader->IsOpen())
   {

diff --git a/xbmc/guilib/TextureBundleXBT.h b/xbmc/guilib/TextureBundleXBT.h
@@ -37,6 +37,8 @@ class CTextureBundleXBT
                 int &width, int &height, int& nLoops, int** ppDelays);
 
   static uint8_t* UnpackFrame(const CXBTFReader& reader, const CXBTFFrame& frame);
+
+  void CloseBundle();
 
 private:
   bool OpenBundle();

diff --git a/xbmc/guilib/TextureManager.cpp b/xbmc/guilib/TextureManager.cpp
@@ -533,7 +533,8 @@ void CGUITextureManager::Cleanup()
     delete pMap;
     i = m_vecTextures.erase(i);
   }
-
+  m_TexBundle[0].Close();
+  m_TexBundle[1].Close();
   m_TexBundle[0] = CTextureBundle(true);
   m_TexBundle[1] = CTextureBundle();
   FreeUnusedTextures();