--- a/jpoker/js/jquery.jpoker.js	Tue Aug 26 13:57:20 2008 +0000
+++ b/jpoker/js/jquery.jpoker.js	Tue Aug 26 14:42:23 2008 +0000
@@ -1207,9 +1207,7 @@
 			server.sendPacket({'type': 'PacketPokerTourneyRegister', 'serial': server.serial, 'game_id' : game_id});
 			server.registerHandler(game_id, function(server, game_id, packet) {
 				if (packet.type == 'PacketPokerTourneyRegister') {
-				    var tourney = new jpoker.tourney(server, packet);
-				    tourney.poll();
-				    server.tourneys[packet.game_id] = tourney;
+				    server.tourneyJoin(packet);
 				    server.notifyUpdate(packet);
 				    server.queueRunning(function() {
 					    if (server.timers.tourneyDetails !== undefined) {
@@ -1275,6 +1273,12 @@
 				return true;
 			    });
 		    });
+	    },
+
+	    tourneyJoin: function(packet) {
+		var tourney = new jpoker.tourney(this, packet);
+		tourney.poll();
+		this.tourneys[packet.game_id] = tourney;
 	    },
 	    
 	    getPersonalInfo : function() {

--- a/jpoker/js/test-jpoker.js	Tue Aug 26 13:57:20 2008 +0000
+++ b/jpoker/js/test-jpoker.js	Tue Aug 26 14:42:23 2008 +0000
@@ -883,6 +883,17 @@
 	equals(table.buyIn.bankroll, money, 'table.buyIn.bankroll');
 
         cleanup();
+    });
+
+test("jpoker.server.tourneyJoin", function(){
+        expect(2);
+	
+	var game_id = 42;
+        var server = jpoker.serverCreate({ url: 'url' });
+        server.tourneyJoin({game_id: game_id});
+	ok(game_id in server.tourneys, 'tourney created');
+	ok(server.tourneys[game_id].pollTimer != -1, 'tourney pollTimer activated');
+	cleanup();
     });
 
 test("jpoker.server.tourneyRegister", function(){