Fixes regression due to the BB walk fix

hh
Laurent 6 years ago
parent 5d439da87a
commit 297cb99cd6
  1. 4
      app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt
  2. 11
      app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/ActionList.kt

@ -229,8 +229,8 @@ class HandHistoryFragment : RealmFragment(), RowRepresentableDelegate, KeyboardL
R.id.edit_save -> saveOrEdit() R.id.edit_save -> saveOrEdit()
R.id.add -> addNewHand() R.id.add -> addNewHand()
R.id.delete -> deleteHand() R.id.delete -> deleteHand()
R.id.back -> showPreviousHand() // R.id.back -> showPreviousHand()
R.id.forward -> showNextHand() // R.id.forward -> showNextHand()
R.id.share -> exportHand() R.id.share -> exportHand()
} }
return true return true

@ -427,7 +427,10 @@ class ActionList(var listener: ActionListListener) : ArrayList<ComputedAction>()
val activePlayerCount = activePositions.size // don't move this line because of removes val activePlayerCount = activePositions.size // don't move this line because of removes
// Blinds must act // Blinds must act
if (!significantAction.action.type!!.isBlind) { val sa = significantAction.action
if (sa.type!!.isBlind && getStreetNextCalls(sa.index).isEmpty()) {
activePositions.remove(significantAction.position)
} else {
activePositions.remove(significantAction.position) activePositions.remove(significantAction.position)
} }
@ -448,9 +451,9 @@ class ActionList(var listener: ActionListListener) : ArrayList<ComputedAction>()
Street.SUMMARY Street.SUMMARY
} }
} // BB Walk } // BB Walk
else if (currentStreet == Street.PREFLOP && activePositions.size == 1 && activePositions.first() == Position.BB) { // else if (currentStreet == Street.PREFLOP && activePositions.size == 1 && activePositions.first() == Position.BB) {
return Street.SUMMARY // return Street.SUMMARY
} // }
} }

Loading…
Cancel
Save