From 97452cb7687749d9ddce00fbaa589217dbc0e03d Mon Sep 17 00:00:00 2001 From: Jaex Date: Sun, 4 Mar 2018 01:12:14 +0300 Subject: [PATCH] Fix destination path issue --- ShareX.HelpersLib/ZipManager.cs | 2 +- ShareX.Setup/Program.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ShareX.HelpersLib/ZipManager.cs b/ShareX.HelpersLib/ZipManager.cs index 3d259118a..c7422892a 100644 --- a/ShareX.HelpersLib/ZipManager.cs +++ b/ShareX.HelpersLib/ZipManager.cs @@ -36,7 +36,7 @@ public static void Extract(string archivePath, string destination, bool retainDi { using (ZipArchive archive = ZipFile.OpenRead(archivePath)) { - string fullName = Directory.CreateDirectory(destination).FullName; + string fullName = Directory.CreateDirectory(Path.GetFullPath(destination)).FullName; foreach (ZipArchiveEntry entry in archive.Entries) { diff --git a/ShareX.Setup/Program.cs b/ShareX.Setup/Program.cs index 04e0c4929..8a47009e1 100644 --- a/ShareX.Setup/Program.cs +++ b/ShareX.Setup/Program.cs @@ -301,7 +301,7 @@ private static void CopyFFmpeg(string destination, bool include32bit, bool inclu if (!File.Exists(FFmpeg32bit)) { string filename = SetupHelpers.DownloadFile("https://ffmpeg.zeranoe.com/builds/win32/static/ffmpeg-20171130-83ecdc9-win32-static.zip"); - ZipManager.Extract(filename, "", false, new List() { "ffmpeg.exe" }); + ZipManager.Extract(filename, ".", false, new List() { "ffmpeg.exe" }); File.Move("ffmpeg.exe", FFmpeg32bit); } @@ -313,7 +313,7 @@ private static void CopyFFmpeg(string destination, bool include32bit, bool inclu if (!File.Exists(FFmpeg64bit)) { string filename = SetupHelpers.DownloadFile("https://ffmpeg.zeranoe.com/builds/win64/static/ffmpeg-20171130-83ecdc9-win64-static.zip"); - ZipManager.Extract(filename, "", false, new List() { "ffmpeg.exe" }); + ZipManager.Extract(filename, ".", false, new List() { "ffmpeg.exe" }); File.Move("ffmpeg.exe", FFmpeg64bit); }