From ae555aea0ee3134f8ff6c42452741d4ae56cfc5f Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Mon, 3 Feb 2014 01:18:35 +0100 Subject: [PATCH] * Memory leaks - TornamentPane can now be removed by gc. --- .../main/java/mage/client/tournament/TournamentPane.java | 3 ++- .../main/java/mage/client/tournament/TournamentPanel.java | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Mage.Client/src/main/java/mage/client/tournament/TournamentPane.java b/Mage.Client/src/main/java/mage/client/tournament/TournamentPane.java index 0f05f36fb79..b833a3a0ff2 100644 --- a/Mage.Client/src/main/java/mage/client/tournament/TournamentPane.java +++ b/Mage.Client/src/main/java/mage/client/tournament/TournamentPane.java @@ -55,7 +55,8 @@ public class TournamentPane extends MagePane { } public void hideTournament() { - tournamentPanel.hideTournament(); + tournamentPanel.cleanUp(); + removeFrame(); } public UUID getTournamentId() { diff --git a/Mage.Client/src/main/java/mage/client/tournament/TournamentPanel.java b/Mage.Client/src/main/java/mage/client/tournament/TournamentPanel.java index b63440b9149..fb6273d5ab9 100644 --- a/Mage.Client/src/main/java/mage/client/tournament/TournamentPanel.java +++ b/Mage.Client/src/main/java/mage/client/tournament/TournamentPanel.java @@ -117,6 +117,13 @@ public class TournamentPanel extends javax.swing.JPanel { } + public void cleanUp() { + this.stopTasks(); + if (this.chatPanel1 != null) { + this.chatPanel1.disconnect(); + } + } + private void saveDividerLocations() { // save panel sizes and divider locations. Rectangle rec = MageFrame.getDesktop().getBounds();