From 554d6562df453a107602ced5a38d2011cc67a671 Mon Sep 17 00:00:00 2001 From: Laurent Clouet Date: Tue, 16 Feb 2016 23:51:16 +0100 Subject: [PATCH] Bugfix: c5997faec86cb27aa52b0dbfa2729ccc050d7181 introduced a regression, it failed to properly stop the client with swing UI --- src/com/sheepit/client/Client.java | 2 -- src/com/sheepit/client/standalone/GuiText.java | 1 + src/com/sheepit/client/standalone/GuiTextOneLine.java | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/sheepit/client/Client.java b/src/com/sheepit/client/Client.java index f9107a9..022159f 100644 --- a/src/com/sheepit/client/Client.java +++ b/src/com/sheepit/client/Client.java @@ -346,8 +346,6 @@ public class Client { } this.server = null; - - this.gui.stop(); return 0; } diff --git a/src/com/sheepit/client/standalone/GuiText.java b/src/com/sheepit/client/standalone/GuiText.java index 1f86f17..573e3af 100644 --- a/src/com/sheepit/client/standalone/GuiText.java +++ b/src/com/sheepit/client/standalone/GuiText.java @@ -64,6 +64,7 @@ public class GuiText implements Gui { } else { client.stop(); + GuiText.this.stop(); } } }); diff --git a/src/com/sheepit/client/standalone/GuiTextOneLine.java b/src/com/sheepit/client/standalone/GuiTextOneLine.java index 5b373db..460c6d6 100644 --- a/src/com/sheepit/client/standalone/GuiTextOneLine.java +++ b/src/com/sheepit/client/standalone/GuiTextOneLine.java @@ -45,6 +45,7 @@ public class GuiTextOneLine implements Gui { } else { client.stop(); + GuiTextOneLine.this.stop(); } } });