X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosPreferences.java;h=569aaa5481f863f9e8558fe8207aaff0f8ef89f1;hp=51fc4205e6b79fa987376ee068cb5b80a30d7ac3;hb=1dce20f7eee56166ac61798ca26eeb323dc8f012;hpb=7175774c4f60ed3efd54417f2035b50ea0108c7b

diff --git a/altoslib/AltosPreferences.java b/altoslib/AltosPreferences.java
index 51fc4205..569aaa54 100644
--- a/altoslib/AltosPreferences.java
+++ b/altoslib/AltosPreferences.java
@@ -365,7 +365,7 @@ public class AltosPreferences {
 	public static void set_state(AltosState state) {
 
 		synchronized(backend) {
-			backend.putJson(String.format(statePreferenceFormat, state.serial), state.json());
+			backend.putJson(String.format(statePreferenceFormat, state.serial), new AltosJson(state));
 			backend.putInt(statePreferenceLatest, state.serial);
 			flush_preferences();
 		}
@@ -405,10 +405,12 @@ public class AltosPreferences {
 	public static AltosState state(int serial) {
 		synchronized(backend) {
 			try {
-				return AltosState.fromJson(backend.getJson(String.format(statePreferenceFormat, serial)));
+				AltosJson json = backend.getJson(String.format(statePreferenceFormat, serial));
+				if (json != null)
+					return (AltosState) (json.make(AltosState.class));
 			} catch (Exception e) {
-				return null;
 			}
+			return null;
 		}
 	}