diff options
| author | jmarshallnz <jmarshallnz@svn> | 2010-08-21 10:04:13 +0000 |
|---|---|---|
| committer | jmarshallnz <jmarshallnz@svn> | 2010-08-21 10:04:13 +0000 |
| commit | 910b5a3ecccd988ab38e01d465b4eaffac3cb803 (patch) | |
| tree | f45a7193428d8bf63bdc60c2ddd4f37a2e4ebc76 /guilib/GUIImage.cpp | |
| parent | 3c4e179f040fa98b98f6f39404c4cca40cfb5ae5 (diff) | |
merged: r33008-r33016 from trunk
fixed: Ensure we reset the current texture filename in image controls when we free it's resources. Partly addresses #9926. (cherry picked from commit 09b566762980c504755a2f08c45de516d3e8ab9d)
fixed: Ensure any images that fail to load are free'd immediately on resource deallocation, to ensure that further attempts to load the image may be made. Fixes #9926. (cherry picked from commit abf4c9fb2c9403ee557d4189e1ea92a86a275e3e)
fixed: TV Show posters were cached using the videodb:// URL rather than the path URL, which meant local thumbs were not updating. #9927. (cherry picked from commit e94d6eb2be093c9f91708b14028e0bd1625e0f40)
fixed: Local TV artwork wasn't being read unless all episodes were being refreshed. (cherry picked from commit 82d444917f1246cb004f9367bdbefcf9abf95c8d)
fixed: Add source prompted for "resume" etc. on click in video files (cherry picked from commit 235ea0c264100e9e45206b1496a2355ac91dbd09)
cleanup: get rid of dupe'd handling of "Add Source" (cherry picked from commit c54a59b827e2bed1d9d4af595bcd3bcd1b6d2839)
fixed: Ticket #7934 - Now playing list not updating on playlist change. (cherry picked from commit 4b8f73f97b6d3e72a2e6a174b823e644dff53161)
fixed: incorrect memset() size in GetTimeZoneInformation (cherry picked from commit c90c1a38e03c9ca4c480b8296ace088023541851)
fixed: Ticket #8274 - disable the pressing of "P" to play folders in plugins, as this can cause many plugins to recurse indefinitely (cherry picked from commit bb651ae4945ff25b0652496654b1a96bbea7b286)
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma@33024 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'guilib/GUIImage.cpp')
| -rw-r--r-- | guilib/GUIImage.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/guilib/GUIImage.cpp b/guilib/GUIImage.cpp index 6f815c4411..28c9dc8959 100644 --- a/guilib/GUIImage.cpp +++ b/guilib/GUIImage.cpp @@ -202,6 +202,7 @@ void CGUIImage::FreeTextures(bool immediately /* = false */) for (unsigned int i = 0; i < m_fadingTextures.size(); i++) delete m_fadingTextures[i]; m_fadingTextures.clear(); + m_currentTexture.Empty(); } void CGUIImage::FreeResources(bool immediately) |