kauron/jstudy
kauron/jstudy
1
0
Fork 0
mirror of https://gitlab.com/kauron/jstudy synced 2024-12-22 16:33:33 +01:00
Code Issues Releases Wiki Activity

Merge branch 'app-ends'

Browse source
This commit is contained in:
Carlos Galindo 2019-09-13 12:08:18 +02:00
commit 50cefbfd53
Signed by: kauron
GPG key ID: 83E68706DEE119A3
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/es/kauron/jstudy/controller/Controller.java
View file

@ -77,6 +77,8 @@ public class Controller implements Initializable {
root.getScene().getWindow().setOnCloseRequest(event -> { root.getScene().getWindow().setOnCloseRequest(event -> {
for (Tab tab : tabPane.getTabs()) { for (Tab tab : tabPane.getTabs()) {
EventHandler<Event> handler = tab.getOnCloseRequest(); EventHandler<Event> handler = tab.getOnCloseRequest();
if (tabMap.containsKey(tab))
tabMap.get(tab).stopTimer();
if (tab.isClosable() && handler != null) { if (tab.isClosable() && handler != null) {
tabPane.getSelectionModel().select(tab); tabPane.getSelectionModel().select(tab);
handler.handle(event); handler.handle(event);

7
src/main/java/es/kauron/jstudy/controller/TableController.java
View file

@ -209,4 +209,11 @@ public class TableController implements Initializable {
timerTask = null; timerTask = null;
} }
} }
void stopTimer() {
timer.cancel();
timer.purge();
if (timerTask != null)
timerTask.cancel();
}
} }