mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix #1565. Construction window now checks to see if it has control of tool before canceling it

This commit is contained in:
duncanspumpkin 2015-11-15 09:12:19 +00:00
parent 97fc78a506
commit cd07fd5d4e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/windows/ride_construction.c
View File

@ -575,8 +575,11 @@ static void window_ride_construction_close(rct_window *w)
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_FLAGS, uint16) &= ~(1 << 1);
// In order to cancel the yellow arrow correctly the
// selection tool should be cancelled.
tool_cancel();
// selection tool should be cancelled. Don't do a tool cancel if
// another window has already taken control of tool.
if (w->classification == RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WINDOWCLASS, rct_windowclass) &&
w->number == RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WINDOWNUMBER, rct_windownumber))
tool_cancel();
hide_gridlines();