From eec433aad9f81b06cde7aade6f90c1f650e79ba7 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Thu, 24 Mar 2016 20:56:04 -0700 Subject: [PATCH] Fix some issues with merging caused by incorrect boolean expressions --- DATabase/Core/Generate.cs | 4 ++-- DATabase/Program.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DATabase/Core/Generate.cs b/DATabase/Core/Generate.cs index 8bf4daab..3495d9a0 100644 --- a/DATabase/Core/Generate.cs +++ b/DATabase/Core/Generate.cs @@ -250,8 +250,8 @@ namespace DATabase List roms = new List(); // Check if we have listed sources or systems - bool sysmerged = (_systems != "" && _systems.Split(',').Length > 1); - bool srcmerged = (_sources != "" && _sources.Split(',').Length > 1); + bool sysmerged = (_systems == "" || _systems.Split(',').Length > 1); + bool srcmerged = (_sources == "" || _sources.Split(',').Length > 1); bool merged = sysmerged || srcmerged; string query = @" diff --git a/DATabase/Program.cs b/DATabase/Program.cs index a1bce1e7..2b84ded1 100644 --- a/DATabase/Program.cs +++ b/DATabase/Program.cs @@ -28,7 +28,7 @@ namespace DATabase // Determine which switches are enabled (with values if necessary) bool help = false, import = false, generate = false, convert = false, - listsys = false, listsrc = false, norename = false, old = false; ; + listsys = false, listsrc = false, norename = false, old = false; string systems = "", sources = "", input = ""; foreach (string arg in args) {