From dc2690df2fd0cee8e6c3060e96686e658dd44288 Mon Sep 17 00:00:00 2001 From: Kevin Ruland Date: Sat, 14 Jan 2012 02:44:13 +0000 Subject: [PATCH] Fix NPE caused when the FlightEvent List was made non-selectable. --- .../net/sf/openrocket/android/simulation/SimulationViewer.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/android/src/net/sf/openrocket/android/simulation/SimulationViewer.java b/android/src/net/sf/openrocket/android/simulation/SimulationViewer.java index 4f43a23e3..97c2568d0 100644 --- a/android/src/net/sf/openrocket/android/simulation/SimulationViewer.java +++ b/android/src/net/sf/openrocket/android/simulation/SimulationViewer.java @@ -79,6 +79,7 @@ public class SimulationViewer extends Activity { } }; + // Events are not selectable for plotting right now. //eventList.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE); eventList.setAdapter(events); @@ -116,6 +117,7 @@ public class SimulationViewer extends Activity { public void draw( View v ) { List eventsToShow = new ArrayList(); + /* Events are not selectable for plotting right now. { SparseBooleanArray eventsSelected = eventList.getCheckedItemPositions(); List flightEvents = data.getEvents(); @@ -125,6 +127,7 @@ public class SimulationViewer extends Activity { } } } + */ FlightDataType series1 = (FlightDataType) series1Spinner.getSelectedItem(); Log.d(TAG,"sereis1 = " + series1.toString()); FlightDataType series2 = (FlightDataType) series2Spinner.getSelectedItem();