[vlc-devel] [PATCH 4/8] gui/skins2: use ThemeLoader::unarchive

Filip Roséen filip at atch.se
Wed Feb 1 02:04:31 CET 2017


---
 modules/gui/skins2/src/theme_loader.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/gui/skins2/src/theme_loader.cpp b/modules/gui/skins2/src/theme_loader.cpp
index 77885ebe6e..b820c56ace 100644
--- a/modules/gui/skins2/src/theme_loader.cpp
+++ b/modules/gui/skins2/src/theme_loader.cpp
@@ -299,11 +299,9 @@ bool ThemeLoader::extract( const std::string &fileName )
     if( tempPath.empty() )
         return false;
 
-    // Extract the file in a temporary directory
-    if( ! extractTarGz( fileName, tempPath ) &&
-        ! extractZip( fileName, tempPath ) )
+    if( unarchive( fileName, tempPath ) == false )
     {
-        deleteTempFiles( tempPath );
+        msg_Err( getIntf(), "extraction from %s failed", fileName.c_str() );
         return false;
     }
 
-- 
2.11.0



More information about the vlc-devel mailing list