client: connection shutdown at exit

* Calling shutdown() before exit() (for the "quit" button)
* Minor other fixes

1 files changed, 4 insertions, 9 deletions

diff --git a/src/Client/UserInterface.java b/src/Client/UserInterface.java
index abf5002..9f7fd5c 100644
--- a/src/Client/UserInterface.java
+++ b/src/Client/UserInterface.java
@@ -109,6 +109,7 @@ public class UserInterface extends JFrame implements ActionListener, KeyListener
 		
 		if (command == "stop")
 		{	
+			client.shutdown();
 			System.exit(0);
 		}
 		
@@ -121,15 +122,6 @@ public class UserInterface extends JFrame implements ActionListener, KeyListener
 //		{
 //			System.exit(0);
 //		}
-//		
-//		
-//		if (e.getSource() == 'enter')
-//		{
-//			output.append(message.getText() + "\n");
-//			client.PRIVMSG(message.getText());
-//			message.setText("");
-//		}
-		
 		
 		
 		if (command == "send" )
@@ -155,14 +147,17 @@ public class UserInterface extends JFrame implements ActionListener, KeyListener
 	}
 
 	@Override
+	//FIXME: Do not send user send text with enter before connect.
 	public void keyPressed(KeyEvent e)
 	{
+		
 		if (e.getKeyChar() == KeyEvent.VK_ENTER)
 		{
 			output.append(message.getText() + "\n");
 			client.PRIVMSG(message.getText());
 			message.setText("");		
 		}
+
 	}
 
 	public void keyReleased(KeyEvent arg0) {}