From f382ecd2bc24a2aae9142a232bdeb572bf270c1e Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 4 Sep 2015 19:23:03 +0000
Subject: [PATCH] Improved database installer dialogs.

---
 .../l2jserver/tools/dbinstaller/RunTasks.java  |  2 --
 .../tools/dbinstaller/gui/DBConfigGUI.java     | 18 ++++++++++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/trunk/java/com/l2jserver/tools/dbinstaller/RunTasks.java b/trunk/java/com/l2jserver/tools/dbinstaller/RunTasks.java
index a4e54eb1f6..49581bb132 100644
--- a/trunk/java/com/l2jserver/tools/dbinstaller/RunTasks.java
+++ b/trunk/java/com/l2jserver/tools/dbinstaller/RunTasks.java
@@ -77,7 +77,5 @@ public class RunTasks extends Thread
 		_frame.setFrameVisible(false);
 		_frame.showMessage("Done!", "Database Installation Complete!", JOptionPane.INFORMATION_MESSAGE);
 		System.exit(0);
-		
 	}
-	
 }
diff --git a/trunk/java/com/l2jserver/tools/dbinstaller/gui/DBConfigGUI.java b/trunk/java/com/l2jserver/tools/dbinstaller/gui/DBConfigGUI.java
index 2fb907cf71..0dbf93140b 100644
--- a/trunk/java/com/l2jserver/tools/dbinstaller/gui/DBConfigGUI.java
+++ b/trunk/java/com/l2jserver/tools/dbinstaller/gui/DBConfigGUI.java
@@ -135,7 +135,21 @@ public class DBConfigGUI extends JFrame
 				DBInstallerGUI dbi = new DBInstallerGUI(connector.getConnection());
 				setVisible(false);
 				
-				if (!_dir.equals("sql/login/"))
+				if (_dir.equals("sql/login/"))
+				{
+					Object[] options =
+					{
+						"Install Login",
+						"Exit"
+					};
+					int n = JOptionPane.showOptionDialog(null, "Install login server database?", "Select an option", JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE, null, options, options[1]);
+					
+					if ((n == 1) || (n == -1))
+					{
+						System.exit(0);
+					}
+				}
+				else
 				{
 					Object[] options =
 					{
@@ -143,7 +157,7 @@ public class DBConfigGUI extends JFrame
 						"Ertheia Install",
 						"Exit"
 					};
-					int n = JOptionPane.showOptionDialog(null, "Select Installation Type", "Installation Type", JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE, null, options, options[1]);
+					int n = JOptionPane.showOptionDialog(null, "Select installation type.", "Select an option", JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE, null, options, options[1]);
 					
 					if ((n == 2) || (n == -1))
 					{