From 2f515e242be2d29ede392ee3ab705145d71df7e1 Mon Sep 17 00:00:00 2001
From: BetaSteward <betasteward@gmail>
Date: Mon, 9 May 2011 22:58:40 -0400
Subject: [PATCH] fixed Issue 64

---
 Mage.Client/src/main/java/mage/client/game/GamePane.java  | 2 ++
 Mage.Client/src/main/java/mage/client/game/GamePanel.java | 1 +
 Mage.Client/src/main/java/mage/client/remote/Client.java  | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Mage.Client/src/main/java/mage/client/game/GamePane.java b/Mage.Client/src/main/java/mage/client/game/GamePane.java
index 74963061084..2bae3de3b6f 100644
--- a/Mage.Client/src/main/java/mage/client/game/GamePane.java
+++ b/Mage.Client/src/main/java/mage/client/game/GamePane.java
@@ -84,11 +84,13 @@ public class GamePane extends MagePane {
 	}
 
 	public void watchGame(UUID gameId) {
+		this.setTitle("Watching " + gameId);
 		gamePanel.watchGame(gameId);
 		this.toFront();
 	}
 
 	public void replayGame(UUID gameId) {
+		this.setTitle("Replaying " + gameId);
 		gamePanel.replayGame(gameId);
 		this.toFront();
 	}
diff --git a/Mage.Client/src/main/java/mage/client/game/GamePanel.java b/Mage.Client/src/main/java/mage/client/game/GamePanel.java
index 8dbc33fb3b8..0e437228dcd 100644
--- a/Mage.Client/src/main/java/mage/client/game/GamePanel.java
+++ b/Mage.Client/src/main/java/mage/client/game/GamePanel.java
@@ -729,6 +729,7 @@ public class GamePanel extends javax.swing.JPanel {
 	private void btnStopWatchingActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnStopWatchingActionPerformed
 		if (modalQuestion("Are you sure you want to stop watching?", "Stop watching") == JOptionPane.YES_OPTION) {
 			session.stopWatching(gameId);
+			this.hideGame();
 		}
 	}//GEN-LAST:event_btnStopWatchingActionPerformed
 
diff --git a/Mage.Client/src/main/java/mage/client/remote/Client.java b/Mage.Client/src/main/java/mage/client/remote/Client.java
index fcd0b7c7bbf..1f06e92af54 100644
--- a/Mage.Client/src/main/java/mage/client/remote/Client.java
+++ b/Mage.Client/src/main/java/mage/client/remote/Client.java
@@ -96,7 +96,7 @@ public class Client implements CallbackClient {
 						replayGame(callback.getObjectId());
 					}
 					else if (callback.getMethod().equals("watchGame")) {
-						watchGame((UUID) callback.getData());
+						watchGame((UUID) callback.getObjectId());
 					}
 					else if (callback.getMethod().equals("chatMessage")) {
 						ChatMessage message = (ChatMessage) callback.getData();