avoid crash for #3069

hippware · Nov 23, 2018 · c9af917 · c9af917
1 parent a1b7364
commit c9af917
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/src/store/HomeStore.ts b/src/store/HomeStore.ts
@@ -104,14 +104,18 @@ const HomeStore = types
     // sets new index for the current mode, deselects previously selected bot and select new one.
     setIndex: (index: number): void => {
       self.fullScreenMode = false
-      self.homeBotList[self.index].setSelected(false)
-      self.index = index
-      if (self.list.length) {
-        // select card
-        self.list[self.index].setSelected(true)
-        // change map center if bot card is selected
-        if (getType(self.list[self.index]) === BotCard) {
-          self.setFocusedLocation((self.list[self.index] as IBotCard).bot.location)
+      if (self.index < self.homeBotList.length) {
+        self.homeBotList[self.index].setSelected(false)
+      }
+      if (index < self.homeBotList.length) {
+        self.index = index
+        if (self.list.length) {
+          // select card
+          self.list[self.index].setSelected(true)
+          // change map center if bot card is selected
+          if (getType(self.list[self.index]) === BotCard) {
+            self.setFocusedLocation((self.list[self.index] as IBotCard).bot.location)
+          }
         }
       }
     },
@@ -134,8 +138,8 @@ const HomeStore = types
         if (index !== -1) {
           self.homeBotList.splice(index, 1)
         }
-        if (index >= self.index) {
-          self.index--
+        if (index <= self.index) {
+          self.setIndex(self.index - 1) // TODO set index within visible area
         }
       },
       // toggleListMode: (): void => {