aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartijn Kaijser <machine.sanctum@gmail.com>2013-07-31 23:45:00 -0700
committerMartijn Kaijser <machine.sanctum@gmail.com>2013-07-31 23:45:00 -0700
commit30f4a79f2754c8d85228bf23c1d3d01db32cb723 (patch)
tree0f3011671eea9b1bf34e896e28ab82ec7a296f25
parent0591979e64e005ccf2a4c02e62e2c0df8940ccc5 (diff)
parent948f09e7535095887c1649db1cdd7fccea7b3ac3 (diff)
downloadxbmc-Gotham_alpha6.tar.xz
Merge pull request #2998 from arnova/pictures_crash_fixGotham_alpha6
fixed: Crash in GUIPicturesWindow caused by PR2890 (fixes #14500)
-rw-r--r--xbmc/pictures/GUIWindowPictures.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/xbmc/pictures/GUIWindowPictures.cpp b/xbmc/pictures/GUIWindowPictures.cpp
index 4e0204c61f..d3b4aa0f92 100644
--- a/xbmc/pictures/GUIWindowPictures.cpp
+++ b/xbmc/pictures/GUIWindowPictures.cpp
@@ -272,7 +272,8 @@ bool CGUIWindowPictures::Update(const CStdString &strDirectory, bool updateFilte
if (CSettings::Get().GetBool("pictures.generatethumbs"))
m_thumbLoader.Load(*m_vecItems);
- CStdString thumb = m_thumbLoader.GetCachedImage(*m_vecItems, "thumb");
+ CPictureThumbLoader thumbLoader;
+ CStdString thumb = thumbLoader.GetCachedImage(*m_vecItems, "thumb");
m_vecItems->SetArt("thumb", thumb);
return true;