Index: trunk/src/scriptbuilder/gui/IncidentEditorFrame.java
===================================================================
--- trunk/src/scriptbuilder/gui/IncidentEditorFrame.java	(revision 81)
+++ trunk/src/scriptbuilder/gui/IncidentEditorFrame.java	(revision 89)
@@ -8,5 +8,4 @@
 
 import java.awt.Adjustable;
-import java.awt.Color;
 import java.awt.event.AdjustmentEvent;
 import java.awt.event.AdjustmentListener;
@@ -54,12 +53,4 @@
      */
     private ArrayList<JButton> eventButtons = null;
-    /**
-     * True if we are currently editing an incident.
-     */
-    private boolean editingIncident;
-    /**
-     * Index of the previous incident.
-     */
-    int oldIncidentIndex;
 
     /**
@@ -127,5 +118,5 @@
             }
 
-            JButton newButton = null;
+            JButton newButton = lastButton;
             switch (e.getKeyChar())
             {
@@ -1470,5 +1461,5 @@
         addNoiseFrame.setVisible(false);
 
-        update(null, theIncident);
+        this.update(null, theIncident);
 }//GEN-LAST:event_jButton2ActionPerformed
 
@@ -1700,5 +1691,4 @@
         zoomSlider.setValue(zoomSlider.getValue() <= 5 ? 5 : zoomSlider.getValue() - 1);
     }//GEN-LAST:event_zoomOutIconMouseClicked
-    private Color selectedColor = Color.BLACK;
 
     /**