Skip to content

Commit

Permalink
Merge pull request #26805 from mlangsdorf/display_fix
Browse files Browse the repository at this point in the history
player_display: fix crash in player_display with many traits
  • Loading branch information
ZhilkinSerg authored Nov 22, 2018
2 parents 6f7b1a6 + f064af6 commit e2fe033
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/player_display.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ Strength - 4; Dexterity - 4; Intelligence - 4; Perception - 4" ) );
if( std::min( bionics_win_size_y, trait_win_size_y ) > max_shared_y ) {
bionics_win_size_y = max_shared_y;
// trait window is less than the shared size, so give space to bionics
} else if( trait_win_size_y < max_shared_y ) {
} else if( trait_win_size_y <= max_shared_y ) {
bionics_win_size_y = maxy - infooffsetybottom - trait_win_size_y;
}
// fall through if bionics is smaller
Expand Down

0 comments on commit e2fe033

Please sign in to comment.