diff --git a/src/main/java/no/ntnu/idatt1002/demo/controller/IncomeExpenseController.java b/src/main/java/no/ntnu/idatt1002/demo/controller/IncomeExpenseController.java index 5ffc03dc0710d1f1def2d92eb0dd6a4bbaba5a31..4b0beeba195ee7934ffa9fb1eaae356019ce06a1 100644 --- a/src/main/java/no/ntnu/idatt1002/demo/controller/IncomeExpenseController.java +++ b/src/main/java/no/ntnu/idatt1002/demo/controller/IncomeExpenseController.java @@ -105,6 +105,9 @@ public class IncomeExpenseController extends FinanceController { @FXML private ComboBox<?> filter; + @FXML + private Button returnToMainMenuBtn; + @FXML private Button returnBtn; @@ -487,16 +490,16 @@ public class IncomeExpenseController extends FinanceController { public void switchScene(javafx.event.ActionEvent event) { try { FXMLLoader loader = new FXMLLoader(); - if (event.getSource() == returnBtn) { + if (event.getSource() == returnToMainMenuBtn) { saveDataToFile(); loader.setLocation(getClass().getResource("/view/MainMenuNew.fxml")); } else if (event.getSource() == continueBtn) { loader.setLocation(getClass().getResource("/view/newBudgetBudgert.fxml")); saveDisposableIncomeToFile(); - } else if (event.getSource() == null) { + } else if (event.getSource() == returnBtn) { + loader.setLocation(getClass().getResource("/view/FirstMenu.fxml")); FileHandlingBudgetArchive.deleteBudgetDirectory(FileHandlingSelectedBudget.readSelectedBudget()); - //removeBudgetNameFromArchive - FileHandlingSelectedBudget.updateSelectedBudget(""); + FileHandlingSelectedBudget.clearSelectedBudget(); } Parent root = loader.load(); Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();