X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosEepromIterable.java;h=dd0afd9f1501bd347683f5cd10871e78a12669f8;hp=8e6a23139d4d5a5a000e0c6978f0b55054880276;hb=c8078d352a7f54a4a97d25af080155d3f875536a;hpb=7ec1b97d278c7aec3199fb7270f0dcf9484c879f

diff --git a/altoslib/AltosEepromIterable.java b/altoslib/AltosEepromIterable.java
index 8e6a2313..dd0afd9f 100644
--- a/altoslib/AltosEepromIterable.java
+++ b/altoslib/AltosEepromIterable.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_1;
+package org.altusmetrum.altoslib_5;
 
 import java.io.*;
 import java.util.*;
@@ -38,6 +38,13 @@ class AltosEepromOrdered implements Comparable<AltosEepromOrdered> {
 		if (cmd_diff != 0)
 			return cmd_diff;
 
+		if (eeprom.has_seconds() && o.eeprom.has_seconds()) {
+			int	seconds_diff = eeprom.seconds() - o.eeprom.seconds();
+
+			if (seconds_diff != 0)
+				return seconds_diff;
+		}
+
 		int	tick_diff = tick - o.tick;
 
 		if (tick_diff != 0)
@@ -73,7 +80,9 @@ class AltosEepromOrderedIterator implements Iterator<AltosEeprom> {
 				tick = t;
 			}
 			olist.add(new AltosEepromOrdered(e, index++, tick));
+			first = false;
 		}
+
 		oiterator = olist.iterator();
 	}
 
@@ -114,4 +123,4 @@ public class AltosEepromIterable implements Iterable<AltosEeprom> {
 			eeproms = new LinkedList<AltosEeprom>();
 		return new AltosEepromOrderedIterator(eeproms);
 	}
-}
\ No newline at end of file
+}