altoslib, altosui: Restructured state management now does TM eeprom files

[fw/altos] / altosui / AltosFlightUI.java

diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java
index 6b258f2e7eb31f0a1ec0b748b69e565e2004fe3c..423cf10c04cd52ba35ae41cae94d4f77f446aaa9 100644 (file)
--- a/altosui/AltosFlightUI.java
+++ b/altosui/AltosFlightUI.java
@@ -101,10 +101,8 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
        public void show(AltosState state, AltosListenerState listener_state) {
                status_update.saved_state = state;
 
-               if (state == null) {
-                       System.out.printf ("no state provided\n");
+               if (state == null)
                        state = new AltosState(new AltosRecord());
-               }
 
                pad.show(state, listener_state);
 
@@ -132,7 +130,7 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
                flightStatus.show(state, listener_state);
                flightInfo.show(state, listener_state);
 
-               if (state.data.companion != null) {
+               if (state.companion != null) {
                        if (!has_companion) {
                                pane.add("Companion", companion);
                                has_companion= true;