summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2012-06-06 18:21:02 +0000
committerCarl Hetherington <carl@carlh.net>2012-06-06 18:21:02 +0000
commit72369f86709737cf6b4a16c7c1061d95c63e1703 (patch)
treec0472a4e69e9e7437ae0f9c9c1db2cc3bb83bee8 /gtk2_ardour
parentc5fd217a4acc83fe3b52824cdc809d0de093f941 (diff)
Patch from epitech_user to fix crash on zooming out too
far (#4806). git-svn-id: svn://localhost/ardour2/branches/3.0@12589 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/editor_ops.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 6d66c57b50..b7462f7c9e 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -1337,9 +1337,9 @@ Editor::temporal_zoom_step (bool coarser)
nfpu = frames_per_unit;
if (coarser) {
- nfpu *= 1.61803399;
+ nfpu = min (9e6, nfpu * 1.61803399);
} else {
- nfpu = max(1.0,(nfpu/1.61803399));
+ nfpu = max (1.0, nfpu / 1.61803399);
}
temporal_zoom (nfpu);