From 8ef03eaccd13e3f2f8f088c3adeb860e9d44c032 Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Thu, 8 Oct 2015 17:40:36 -0700
Subject: [PATCH] Database sanity checking before opening

---
 PKX/f1-Main.cs      | 6 +++++-
 SAV/SAV_Database.cs | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/PKX/f1-Main.cs b/PKX/f1-Main.cs
index 0e999dc43..4a3833211 100644
--- a/PKX/f1-Main.cs
+++ b/PKX/f1-Main.cs
@@ -3466,7 +3466,11 @@ private void B_JPEG_Click(object sender, EventArgs e)
         }
         private void B_OpenDB_Click(object sender, EventArgs e)
         {
-            new SAV_Database(this).Show();
+            if (Directory.Exists("db"))
+                new SAV_Database(this).Show();
+            else
+                Util.Alert("PKHeX's database was not found",
+                    "Please dump all boxes from a save file, then ensure the 'db' folder exists.");
         }
         // Save Folder Related
         private void clickSaveFileName(object sender, EventArgs e)
diff --git a/SAV/SAV_Database.cs b/SAV/SAV_Database.cs
index ca6fd28a6..3bec4fdfa 100644
--- a/SAV/SAV_Database.cs
+++ b/SAV/SAV_Database.cs
@@ -95,8 +95,8 @@ public SAV_Database(Main f1)
             // Prepare Database
             prepareDBForSearch();
         }
-        private string DatabasePath = Path.Combine(Path.GetDirectoryName(Process.GetCurrentProcess().MainModule.FileName), "db");
         private Main m_parent;
+        private const string DatabasePath = "db";
         private List<DatabaseList> Database = new List<DatabaseList>();
         private List<PK6> Results;
         private List<PK6> RawDB;