From 40d9c7b1ffb90cd71684722e56429c2a4e9a6c13 Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Tue, 7 May 2013 02:37:00 -0400
Subject: [PATCH] Fixes #902

---
 src/app/pets.coffee | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/app/pets.coffee b/src/app/pets.coffee
index 023cbaa84e..fe15f36022 100644
--- a/src/app/pets.coffee
+++ b/src/app/pets.coffee
@@ -38,17 +38,18 @@ module.exports.app = (appExports, model) ->
 #    user.remove 'items.hatchingPotions', hatchingPotionIdx, 1
 #    user.remove 'items.eggs', eggIdx, 1
 
-  appExports.choosePet = (e, el) ->
+  appExports.choosePet = (e, el, next) ->
     petStr = $(el).attr('data-pet')
+
+    return next() if user.get('items.pets').indexOf(petStr) == -1
+    # If user's pet is already active, deselect it
+    return user.set 'items.currentPet', {} if user.get('items.currentPet.str') is petStr
+
     [name, modifier] = petStr.split('-')
     pet = _.findWhere pets, name: name
     pet.modifier = modifier
     pet.str = petStr
-    ownsThisPet = user.get('items.pets').indexOf petStr
-    if ownsThisPet != -1
-      # If user's pet is already active, deselect it
-      pet = {} if user.get('items.currentPet.str') is petStr
-      user.set 'items.currentPet', pet
+    user.set 'items.currentPet', pet
 
   appExports.buyHatchingPotion = (e, el) ->
     name = $(el).attr 'data-hatchingPotion'