X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=blobdiff_plain;f=MooMenu.java;h=8c9b648dc7018b2658aceb301614ac84835d5891;hp=9abc407a9a4222b2a83305737958725c992807b8;hb=6154ba318198471a2b94391df6aab6f2b6cd9b29;hpb=11fcb74f0ca701b2ac9fb61ff459b19207213dbd

diff --git a/MooMenu.java b/MooMenu.java
index 9abc407..8c9b648 100644
--- a/MooMenu.java
+++ b/MooMenu.java
@@ -152,7 +152,7 @@ public class MooMenu extends JMenuBar implements ActionListener {
 		Sequence seq;
 		
 		if(command == "New") {
-			Moosique.clearSequence();
+			if (!Moosique.promptOnUnsavedChanges()) Moosique.clearSequence();
 		} else if (command == "Open...") {
 			// Shows a file chooser. If shown previously, starts in the current directory.
 			if (directory != null) {
@@ -167,7 +167,8 @@ public class MooMenu extends JMenuBar implements ActionListener {
 			File file = chooser.getSelectedFile();
     			if(returnVal == JFileChooser.APPROVE_OPTION && isMidiFile(file)) {
 				directory = chooser.getSelectedFile().getParentFile();
-				Moosique.load(chooser.getSelectedFile().getAbsolutePath());
+				if (!Moosique.promptOnUnsavedChanges())
+					Moosique.load(chooser.getSelectedFile().getAbsolutePath());
 			}
 		} else if (command == "Save") {
 			if (!Moosique.save()) showSaveAsDialog();