From 66000609e77c48b75619748e85245fd2e54adfa8 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Thu, 7 Apr 2016 13:06:46 -0700
Subject: [PATCH] Broadest matches should go last

---
 DATabase/Import.cs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/DATabase/Import.cs b/DATabase/Import.cs
index 47218c00..9311350a 100644
--- a/DATabase/Import.cs
+++ b/DATabase/Import.cs
@@ -98,10 +98,10 @@ namespace SabreTools
 			GroupCollection fileinfo;
 			DatType type = DatType.none;
 
-			if (Regex.IsMatch(filename, _mamePattern))
+			if (Regex.IsMatch(filename, _nonGoodPattern))
 			{
-				fileinfo = Regex.Match(filename, _mamePattern).Groups;
-				type = DatType.MAME;
+				fileinfo = Regex.Match(filename, _nonGoodPattern).Groups;
+				type = DatType.NonGood;
 			}
 			else if (Regex.IsMatch(filename, _maybeIntroPattern))
 			{
@@ -125,11 +125,6 @@ namespace SabreTools
 				fileinfo = Regex.Match(filename, _noIntroSpecialPattern).Groups;
 				type = DatType.NoIntro;
 			}
-			else if (Regex.IsMatch(filename, _nonGoodPattern))
-			{
-				fileinfo = Regex.Match(filename, _nonGoodPattern).Groups;
-				type = DatType.NonGood;
-			}
 			else if (Regex.IsMatch(filename, _redumpPattern))
 			{
 				fileinfo = Regex.Match(filename, _redumpPattern).Groups;
@@ -162,6 +157,11 @@ namespace SabreTools
 				fileinfo = Regex.Match(filename, _defaultPattern).Groups;
 				type = DatType.Custom;
 			}
+			else if (Regex.IsMatch(filename, _mamePattern))
+			{
+				fileinfo = Regex.Match(filename, _mamePattern).Groups;
+				type = DatType.MAME;
+			}
 			// If the type is still unmatched, the data can't be imported yet
 			else
 			{