codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-02-17 08:50:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Couldn't reproduce #1851, but this should work around the error if it happens again.

Browse source
This commit is contained in:
Nick Winter 2014-12-06 09:46:37 -08:00
parent 175cdb5151
commit 00e6ce5f45
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/lib/LevelSetupManager.coffee
View file

@ -83,7 +83,7 @@ module.exports = class LevelSetupManager extends CocoClass
@inventoryModal.render()
@inventoryModal.didReappear()
@inventoryModal.onShown()
@inventoryModal.setHero(e.hero)
@inventoryModal.setHero(e.hero) if e.hero
window.tracker?.trackEvent 'Choose Inventory', category: 'Play Level', ['Google Analytics']
onChooseHeroClicked: ->

5
app/views/play/modal/PlayHeroesModal.coffee
View file

@ -287,7 +287,9 @@ module.exports = class PlayHeroesModal extends ModalView
#- Exiting
saveAndHide: ->
hero = @selectedHero.get('original')
hero = @selectedHero?.get('original')
unless hero
console.error 'Somehow we tried to hide without having a hero selected yet...'
if @session
changed = @updateHeroConfig(@session, hero)
@ -311,6 +313,7 @@ module.exports = class PlayHeroesModal extends ModalView
@trigger?('confirm-click', hero: @selectedHero)
updateHeroConfig: (model, hero) ->
return false unless hero
heroConfig = _.clone(model.get('heroConfig')) or {}
if heroConfig.thangType isnt hero
heroConfig.thangType = hero