summaryrefslogtreecommitdiff
path: root/src/viewport_gui.cpp
diff options
context:
space:
mode:
authorAlexander Weiss <ik@alexanderweiss.nl>2018-04-28 00:12:49 +0200
committerMichael Lutz <michi@icosahedron.de>2018-05-24 21:31:37 +0200
commite1a164b5316a6242d69d56b53c9df19edb9d279f (patch)
treed818e4d7ff211cd34cb458099be113b31ba2ea9a /src/viewport_gui.cpp
parent6df7ced343deb150323f709822b5fde1e8fe1d97 (diff)
downloadopenttd-e1a164b5316a6242d69d56b53c9df19edb9d279f.tar.xz
Change: [OSX] Setting mouse-wheel to scroll the map does not disable pinch to zoom
Diffstat (limited to 'src/viewport_gui.cpp')
-rw-r--r--src/viewport_gui.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/viewport_gui.cpp b/src/viewport_gui.cpp
index cbd300dec..9c89a85f8 100644
--- a/src/viewport_gui.cpp
+++ b/src/viewport_gui.cpp
@@ -138,7 +138,7 @@ public:
virtual void OnMouseWheel(int wheel)
{
- if (_settings_client.gui.scrollwheel_scrolling == 0) {
+ if (_settings_client.gui.scrollwheel_scrolling != 2) {
ZoomInOrOutToCursorWindow(wheel < 0, this);
}
}