X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmaterial.h;h=bec2d662b7d970032d3f8b6eb4f17727c4088f11;hp=abd9ffaaadeb99215c4db07cdcd790f166fd7c1a;hb=ace8e951d70c2986a0af83effcc0d2b2312d29e3;hpb=d4af15f682c1967450233ab62cba1a6c5d601df6

diff --git a/src/material.h b/src/material.h
index abd9ffaa..bec2d662 100644
--- a/src/material.h
+++ b/src/material.h
@@ -50,9 +50,9 @@ struct Entry {
   // the position. For instance, in KBP vs K endgames, the scaling function looks
   // for rook pawns and wrong-colored bishops.
   ScaleFactor scale_factor(const Position& pos, Color c) const {
-    return   !scalingFunction[c]
-          || (*scalingFunction[c])(pos) == SCALE_FACTOR_NONE ? ScaleFactor(factor[c])
-                                                             : (*scalingFunction[c])(pos);
+    ScaleFactor sf = scalingFunction[c] ? (*scalingFunction[c])(pos)
+                                        :  SCALE_FACTOR_NONE;
+    return sf != SCALE_FACTOR_NONE ? sf : ScaleFactor(factor[c]);
   }
 
   Key key;