Changeset 140 in tmcsimulator-scriptbuilder for trunk/src/event/editor/UnitPanel.java

Timestamp:

12/22/2017 02:05:13 PM (8 years ago)

Author:

bmcguffin

Message:

Fixed defect #67. Removing an event and then closing the event editor window no longer causes the program to hang; a null check for the event is encountered before taking action upon close of the window.

File:

• trunk/src/event/editor/UnitPanel.java (modified) (1 diff)

trunk/src/event/editor/UnitPanel.java

@@ -94 +94 @@
     public void uponClose()
     {
-        event.unitNum = txtUnitNumber.getText();
-        event.unitActive = ActiveDropdown.getSelectedItem().toString();
-        event.unitPrimary = PrimaryDropdown.getSelectedItem().toString();
-        event.unitStatus = StatusDropdown.getSelectedItem().toString();
+        if (event != null)
+        {
+            event.unitNum = txtUnitNumber.getText();
+            event.unitActive = ActiveDropdown.getSelectedItem().toString();
+            event.unitPrimary = PrimaryDropdown.getSelectedItem().toString();
+            event.unitStatus = StatusDropdown.getSelectedItem().toString();
+        }
     }