From e867be317605c0fe2c177c390c9da9b232be3cbf Mon Sep 17 00:00:00 2001
From: montellese <montellese@xbmc.org>
Date: Thu, 5 Feb 2015 20:32:25 +0100
Subject: [PATCH] CGUIViewStateWindowPictures: cleanup GetExtensions()

---
 xbmc/pictures/GUIViewStatePictures.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/xbmc/pictures/GUIViewStatePictures.cpp b/xbmc/pictures/GUIViewStatePictures.cpp
index 20b682b9161d2..dcb9f3be4d068 100644
--- a/xbmc/pictures/GUIViewStatePictures.cpp
+++ b/xbmc/pictures/GUIViewStatePictures.cpp
@@ -73,10 +73,11 @@ std::string CGUIViewStateWindowPictures::GetLockType()
 
 std::string CGUIViewStateWindowPictures::GetExtensions()
 {
+  std::string extensions = g_advancedSettings.m_pictureExtensions;
   if (CSettings::Get().GetBool("pictures.showvideos"))
-    return g_advancedSettings.m_pictureExtensions+"|"+g_advancedSettings.m_videoExtensions;
+    extensions += "|" + g_advancedSettings.m_videoExtensions;
 
-  return g_advancedSettings.m_pictureExtensions;
+  return extensions;
 }
 
 VECSOURCES& CGUIViewStateWindowPictures::GetSources()