X-Git-Url: https://git.pterodactylus.net/?p=jkeytool.git;a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Fjkeytool%2Fgui%2Fswing%2FSwingInterface.java;h=7e3e300b65f831dd6a76c7ccb55cdba29ccc2cd2;hp=3c99f0bbbdc59d0714ccb6e0339939daeaee12e5;hb=56eee1c83b115795d71515ee5b65d5ef6b05c22f;hpb=28050707430b026c060a0ae29fea32c3aa88af3f

diff --git a/src/net/pterodactylus/jkeytool/gui/swing/SwingInterface.java b/src/net/pterodactylus/jkeytool/gui/swing/SwingInterface.java
index 3c99f0b..7e3e300 100644
--- a/src/net/pterodactylus/jkeytool/gui/swing/SwingInterface.java
+++ b/src/net/pterodactylus/jkeytool/gui/swing/SwingInterface.java
@@ -21,6 +21,8 @@ package net.pterodactylus.jkeytool.gui.swing;
 
 import java.awt.BorderLayout;
 import java.awt.event.ActionEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
 import java.io.File;
 import java.security.KeyStore;
 import java.util.HashMap;
@@ -137,6 +139,17 @@ public class SwingInterface implements Interface {
 		mainFrame.getContentPane().add(createCenterPanel(), BorderLayout.CENTER);
 		mainFrame.getContentPane().add(statusBar, BorderLayout.PAGE_END);
 		mainFrame.pack();
+		mainFrame.addWindowListener(new WindowAdapter() {
+
+			/**
+			 * {@inheritDoc}
+			 */
+			@Override
+			@SuppressWarnings("synthetic-access")
+			public void windowClosing(WindowEvent windowEvent) {
+				quit();
+			}
+		});
 	}
 
 	/**
@@ -229,7 +242,7 @@ public class SwingInterface implements Interface {
 	 * {@inheritDoc}
 	 */
 	public void keyStoreLoaded(File keyStoreFile, KeyStore keyStore) {
-		KeyStorePanel keyStorePanel = new KeyStorePanel(keyStore);
+		KeyStorePanel keyStorePanel = new KeyStorePanel(i18n, keyStore);
 		keyStores.put(keyStore, keyStorePanel);
 		tabPane.addTab(keyStoreFile.getName(), keyStorePanel);
 	}