From 3523feb20b16523c210829d9ef1ae1eb46450a87 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Wed, 6 Apr 2016 17:09:51 -0700 Subject: [PATCH] Fix zipped output --- DATabase/DATabase.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DATabase/DATabase.cs b/DATabase/DATabase.cs index f1a1a684..a6c2fa1c 100644 --- a/DATabase/DATabase.cs +++ b/DATabase/DATabase.cs @@ -472,8 +472,8 @@ Make a selection: /// True if the output file should be in RomVault format (default false) private static void InitGenerateAll(string outdir, bool norename, bool old) { - string actualdir = outdir + "/"; - outdir = outdir + "/temp/"; + string actualdir = (outdir == "" ? Environment.CurrentDirectory + "/" : outdir + "/"); + outdir = actualdir + "/temp/"; // Generate system-merged string query = @"SELECT DISTINCT systems.id @@ -568,7 +568,7 @@ Make a selection: string internalFolder = (filename.Contains("ALL (merged") ? "" : filename.Contains("merged") ? "merged-system/" : filename.Contains("ALL") ? "merged-source/" : "custom/"); - zip.CreateEntryFromFile(filename, internalFolder + filename); + zip.CreateEntryFromFile(filename, internalFolder + Path.GetFileName(filename)); } } zip.Dispose();