Index: /trunk/src/event/editor/frame/Editor.java
===================================================================
--- /trunk/src/event/editor/frame/Editor.java	(revision 180)
+++ /trunk/src/event/editor/frame/Editor.java	(revision 181)
@@ -199,27 +199,26 @@
                 //If we deleted the first event(s), this will add the offsets,
                 //to ensure that events stay at the correct times
-                Object[] options = {"Yes","Cancel"};
-                    int result = JOptionPane.showOptionDialog(null,"Are you sure you want to exit without saving?",
-                            "Exit",
-                            JOptionPane.YES_NO_OPTION,
-                            JOptionPane.QUESTION_MESSAGE,
-                            null,
-                            options,
-                            options[1]);
-                    switch (result){
-                        //should just close
-                        case 0:
-                            closeWindow();
-                            //this.setVisible(true);
-                            break;
-                        // should do nothing
-                        case 1:
-                            
-                            break;
-                        default:
-                            break;
-                    }
-                //add a do you want to close without saving popup window here
-               
+                Object[] options = {"Cancel","OK"};
+                int result = JOptionPane.showOptionDialog(null,
+                        "Are you sure you want to exit without saving?",
+                        "Confirm Exit",
+                        JOptionPane.OK_CANCEL_OPTION,
+                        JOptionPane.QUESTION_MESSAGE,
+                        null,
+                        options,
+                        options[1]);
+                // Take action depending on user choice
+                switch (result)
+                {
+                    //OK: should just close
+                    case 1:
+                        closeWindow();
+                        break;
+                    // Cancel: should do nothing
+                    case 0:                            
+                        break;
+                    default:
+                        break;
+                }
             }
         });