From 19974c3178bd6dfec29dac6b68f7722747163d06 Mon Sep 17 00:00:00 2001 From: Zlatin Balevsky Date: Fri, 18 Feb 2022 08:27:24 +0000 Subject: [PATCH] properly display MyFeed dialog --- .../controllers/com/muwire/gui/MainFrameController.groovy | 2 +- .../controllers/com/muwire/gui/MyFeedController.groovy | 1 - gui/griffon-app/views/com/muwire/gui/MyFeedView.groovy | 5 ----- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy b/gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy index 28143a1f..cacb753c 100644 --- a/gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy +++ b/gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy @@ -377,7 +377,7 @@ class MainFrameController { void showMyFeed() { def params = [:] params['core'] = model.core - mvcGroup.createMVCGroup("my-feed", params) + mvcGroup.createMVCGroup("my-feed", params).destroy() } @ControllerAction diff --git a/gui/griffon-app/controllers/com/muwire/gui/MyFeedController.groovy b/gui/griffon-app/controllers/com/muwire/gui/MyFeedController.groovy index 1a04c0b0..cadc1132 100644 --- a/gui/griffon-app/controllers/com/muwire/gui/MyFeedController.groovy +++ b/gui/griffon-app/controllers/com/muwire/gui/MyFeedController.groovy @@ -33,6 +33,5 @@ class MyFeedController { @ControllerAction void close() { view.dialog.setVisible(false) - mvcGroup.destroy() } } \ No newline at end of file diff --git a/gui/griffon-app/views/com/muwire/gui/MyFeedView.groovy b/gui/griffon-app/views/com/muwire/gui/MyFeedView.groovy index 4d10de9d..03ba5f14 100644 --- a/gui/griffon-app/views/com/muwire/gui/MyFeedView.groovy +++ b/gui/griffon-app/views/com/muwire/gui/MyFeedView.groovy @@ -126,11 +126,6 @@ class MyFeedView { pack() setLocationRelativeTo(mainFrame) setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE) - addWindowListener(new WindowAdapter() { - public void windowClosed(WindowEvent e) { - mvcGroup.destroy() - } - }) show() } }