From 849772f0fd50fdbbc6eb46625a19f1c0602d4517 Mon Sep 17 00:00:00 2001 From: rubidium Date: Sat, 22 Jan 2011 14:51:36 +0000 Subject: (svn r21889) -Fix [FS#4434]: crash when scrolling outside of the main window (with some video backends) --- src/main_gui.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/main_gui.cpp b/src/main_gui.cpp index e572ea301..e12f417e8 100644 --- a/src/main_gui.cpp +++ b/src/main_gui.cpp @@ -413,15 +413,8 @@ struct MainWindow : Window virtual void OnScroll(Point delta) { - ViewPort *vp = IsPtInWindowViewport(this, _cursor.pos.x, _cursor.pos.y); - - if (vp == NULL) { - _cursor.fix_at = false; - _scrolling_viewport = false; - } - - this->viewport->scrollpos_x += ScaleByZoom(delta.x, vp->zoom); - this->viewport->scrollpos_y += ScaleByZoom(delta.y, vp->zoom); + this->viewport->scrollpos_x += ScaleByZoom(delta.x, this->viewport->zoom); + this->viewport->scrollpos_y += ScaleByZoom(delta.y, this->viewport->zoom); this->viewport->dest_scrollpos_x = this->viewport->scrollpos_x; this->viewport->dest_scrollpos_y = this->viewport->scrollpos_y; } -- cgit v1.2.3-54-g00ecf