Mercurial > hg > openttd
changeset 7855:a0f98640dc9c draft
(svn r11405) -Fix: in rare cases OpenTTD could segfault when resizing and scroll the main window (Rafal Rzepecki)
author | truelight <truelight@openttd.org> |
---|---|
date | Sun, 11 Nov 2007 12:26:44 +0000 |
parents | 511414333791 |
children | cdcab4e1c890 |
files | src/window.cpp |
diffstat | 1 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/window.cpp +++ b/src/window.cpp @@ -1466,6 +1466,12 @@ w = FindWindowFromPt(_cursor.pos.x, _cursor.pos.y); + if (!(_right_button_down || scrollwheel_scrolling) || w == NULL) { + _cursor.fix_at = false; + _scrolling_viewport = false; + return true; + } + if (WP(w, vp_d).follow_vehicle != INVALID_VEHICLE && w == FindWindowById(WC_MAIN_WINDOW, 0)) { /* If the main window is following a vehicle, then first let go of it! */ const Vehicle *veh = GetVehicle(WP(w, vp_d).follow_vehicle); @@ -1473,12 +1479,6 @@ return true; } - if (!(_right_button_down || scrollwheel_scrolling) || w == NULL) { - _cursor.fix_at = false; - _scrolling_viewport = false; - return true; - } - if (_patches.reverse_scroll) { e.we.scroll.delta.x = -_cursor.delta.x; e.we.scroll.delta.y = -_cursor.delta.y;