From 9c689df40177028c8d535a06e249fc7f63f185bd Mon Sep 17 00:00:00 2001
From: Guangcong Luo <guangcongluo@gmail.com>
Date: Fri, 3 May 2013 16:53:44 -0700
Subject: [PATCH] Closing PM window cancels challenge

---
 js/client-mainmenu.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/js/client-mainmenu.js b/js/client-mainmenu.js
index f10f6208e..a1c411e75 100644
--- a/js/client-mainmenu.js
+++ b/js/client-mainmenu.js
@@ -109,6 +109,10 @@
 			if ($rejectButton.length) {
 				this.rejectChallenge(userid, $rejectButton);
 			}
+			$rejectButton = $pmWindow.find('button[name=cancelChallenge]');
+			if ($rejectButton.length) {
+				this.cancelChallenge(userid, $rejectButton);
+			}
 
 			var $next = $pmWindow.next();
 			while ($next.length && $next.css('display') === 'none') {
@@ -204,7 +208,7 @@
 						if ($challenge.find('button[name=acceptChallenge]').length) {
 							$challenge.html('<p>The challenge was cancelled.</p><p><button name="dismissChallenge">OK</button></p>');
 						} else {
-							$challenge.html('<p>The challenge was rejected.</p><p><button name="dismissChallenge">OK</button></p>');
+							this.dismissChallenge();
 						}
 					}
 				}