X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=8d8060b55571f9b4420ba29a674e791ce48f58e9;hp=f4f475fb18baa75d7cdb4535723d455daf14be4f;hb=66d5c13a88f041247adf2ba62acdf936a6d6224e;hpb=0edad63b440a81f764efd168b0bd5733850095ae

diff --git a/src/movepick.cpp b/src/movepick.cpp
index f4f475fb..8d8060b5 100644
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -141,7 +141,7 @@ void MovePicker::go_next_phase() {
   case PH_EVASIONS:
       assert(pos.is_check());
       lastMove = generate_evasions(pos, moves);
-      score_evasions();
+      score_evasions_or_checks();
       return;
 
   case PH_QCAPTURES:
@@ -150,8 +150,8 @@ void MovePicker::go_next_phase() {
       return;
 
   case PH_QCHECKS:
-      // Perhaps we should order moves move here?  FIXME
       lastMove = generate_non_capture_checks(pos, moves);
+      score_evasions_or_checks();
       return;
 
   case PH_STOP:
@@ -224,7 +224,7 @@ void MovePicker::score_noncaptures() {
   }
 }
 
-void MovePicker::score_evasions() {
+void MovePicker::score_evasions_or_checks() {
   // Try good captures ordered by MVV/LVA, then non-captures if
   // destination square is not under attack, ordered by history
   // value, and at the end bad-captures and non-captures with a
@@ -232,6 +232,10 @@ void MovePicker::score_evasions() {
   Move m;
   int seeScore;
 
+  // Skip if we don't have at least two moves to order
+  if (lastMove < moves + 2)
+      return;
+
   for (MoveStack* cur = moves; cur != lastMove; cur++)
   {
       m = cur->move;