vlc | branch: master | Filip Roséen <fi...@atch.se> | Fri Dec 16 13:38:57 2016 +0100| [d70ed82cb965baceacb7b8f2f97e80c410f03ae5] | committer: Jean-Baptiste Kempf
gui/skins2: use ThemeLoader::unarchive Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d70ed82cb965baceacb7b8f2f97e80c410f03ae5 --- 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 f6c5f80..a90047e 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; } _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
