Index: trunk/src/scriptbuilder/gui/panels/IncidentTimelinePanel.java
===================================================================
--- trunk/src/scriptbuilder/gui/panels/IncidentTimelinePanel.java	(revision 150)
+++ trunk/src/scriptbuilder/gui/panels/IncidentTimelinePanel.java	(revision 155)
@@ -63,5 +63,9 @@
      * If true, right-clicking on this panel will produce the popup menu.
      */
-    private boolean hasPopupAccess;
+    private boolean hasPopupAccessRightClick;
+    /**
+     * If true, left-clicking on this panel will produce the popup menu.
+     */
+    private boolean hasPopupAccessLeftClick;
     
     int cursorTime, lastSlice, x, y;
@@ -250,5 +254,5 @@
                         
                         addTime = -(addTime-(addTime%20));
-                        
+                        //this if statement might be useless?
                         if(offset<=incident.offset+incident.length)
                         {
@@ -274,5 +278,32 @@
 
             // Does user want a popup menu?
-            if (e.isPopupTrigger() && hasPopupAccess)
+            if (e.isPopupTrigger() && hasPopupAccessRightClick)
+            {
+                if(getTopLevelAncestor() instanceof IncidentEditorFrame)
+                {
+                    if (((IncidentEditorFrame)getTopLevelAncestor()).currentEventType == null){
+                        JPopupMenu popup = createPopup(currentMouseX,currentMouseY);
+                        popup.show(e.getComponent(), currentMouseX, currentMouseY);
+                        
+                    }
+                    
+                }else
+                {
+                    JPopupMenu popup = createPopup();
+                    popup.show(e.getComponent(), currentMouseX, currentMouseY);
+                }
+                
+                
+                
+            }
+        }
+        @Override
+        public void mouseReleased(MouseEvent e)
+        {
+            int currentMouseX = e.getX();
+            int currentMouseY = e.getY();
+
+            // Does user want a popup menu?
+            if (e.isPopupTrigger() && hasPopupAccessRightClick)
             {
                 if(getTopLevelAncestor() instanceof IncidentEditorFrame)
@@ -285,20 +316,4 @@
                     popup.show(e.getComponent(), currentMouseX, currentMouseY);
                 }
-                
-                
-                
-            }
-        }
-        @Override
-        public void mouseReleased(MouseEvent e)
-        {
-            int currentMouseX = e.getX();
-            int currentMouseY = e.getY();
-
-            // Does user want a popup menu?
-            if (e.isPopupTrigger() && hasPopupAccess)
-            {
-                JPopupMenu popup = createPopup();
-                popup.show(e.getComponent(), currentMouseX, currentMouseY);
             }
         }
@@ -323,4 +338,5 @@
             else if (getTopLevelAncestor() instanceof IncidentEditorFrame)
             {
+                
                 incidentEditFrameCurrent = (IncidentEditorFrame) getTopLevelAncestor();
                 editor = new Editor(incidentEditFrameCurrent);
@@ -485,5 +501,5 @@
         super();
 
-        hasPopupAccess = true;
+        hasPopupAccessRightClick = true;
 
         requestedEditorFillerTime = 0;
@@ -525,5 +541,5 @@
         super();
 
-        hasPopupAccess = usesPopup;
+        hasPopupAccessRightClick = usesPopup;
 
         requestedEditorFillerTime = 0;