--- a/jpoker/js/jquery.jpoker.js	Mon Jan 18 21:18:48 2010 +0100
+++ b/jpoker/js/jquery.jpoker.js	Thu Jan 21 16:11:23 2010 +0100
@@ -4590,6 +4590,7 @@
         rebuy_options: { width: 'none', height: 'none', autoOpen: false, resizable: false },
 
         rebuy: function(url, game_id, serial, id) {
+	    $('#rebuy' + id).show();
 	    var server = jpoker.getServer(url);
             var player = jpoker.getPlayer(url, game_id, serial);
             if(!player) {
@@ -4605,7 +4606,7 @@
             }
             var packet_type;
             var label;
-            if(player.state == 'buyin') {
+            if ((player.state == 'buyin') && !player.buy_in_payed) {
                 packet_type = 'PacketPokerBuyIn';
                 label = _("Buy In");
             } else {

--- a/jpoker/js/test-jpoker.js	Mon Jan 18 21:18:48 2010 +0100
+++ b/jpoker/js/test-jpoker.js	Thu Jan 21 16:11:23 2010 +0100
@@ -8844,7 +8844,7 @@
     });
 
 test("jpoker.plugins.player: rebuy", function(){
-        expect(25);
+        expect(30);
 
         var id = 'jpoker' + jpoker.serial;
         var player_serial = 1;
@@ -8898,6 +8898,22 @@
         equals(sent, true, 'BuyIn packet sent');
         equals(rebuy.parents().is(':hidden'), true, 'dialog hidden');
 
+	player.buy_in_payed = true;
+        sent = false;
+        sendPacket = server.sendPacket;
+        server.sendPacket = function(packet) {
+            server.sendPacket = sendPacket;
+            equals(packet.type, 'PacketPokerRebuy');
+            sent = true;
+        };
+	$("#rebuy" + id).hide().click();
+        $("button", rebuy).click();
+        equals(sent, true, 'Rebuy packet sent');
+        equals(rebuy.parents().is(':hidden'), true, 'dialog hidden');
+	
+	$("#rebuy" + id).hide();
+	jpoker.plugins.playerSelf.rebuy('url', game_id, player.serial, id);
+	equals($("#rebuy" + id).is(":visible"), true, "rebuy should be shown if cancelled");
 
         // rebuy
         player.state = 'playing';