Make sure the client is initialized with history (so that events in t…

…he past can always be handled without resetting)
FrozenCow · Aug 2, 2013 · ccf2b69 · ccf2b69
1 parent a4509c5
commit ccf2b69
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/web/network-client.js b/web/network-client.js
@@ -30,8 +30,7 @@ define([],function() {
 	function handleInitialize(msg) {
 		this.clientid = msg.clientid;
 
-		// Replace all timeframes with the one we received.
-		this.simulator.timeframes.splice(0,this.simulator.length,msg.timeframe);
+		this.simulator.resetToTimeFrames(msg.timeframes);
 
 		this.status = NetworkClient.STATUS_ACTIVE;
 

diff --git a/web/network-server.js b/web/network-server.js
@@ -40,7 +40,7 @@ define(['./utils'],function(utils) {
 			client.messenger.send({
 				type: 'initialize',
 				clientid: client.id,
-				timeframe: this.simulator.getLastTimeFrame()
+				timeframes: this.simulator.timeframes
 			});
 
 			messenger.onmessage = handleMessage.bind(client);