Merge branch 'gattschardo-scaledown'

1 files changed, 0 insertions, 6 deletions

diff --git a/src/keyevents.c b/src/keyevents.c
index 4c1ed28..ba15a5d 100644
--- a/src/keyevents.c
+++ b/src/keyevents.c
@@ -612,14 +612,8 @@ void feh_event_handle_keypress(XEvent * ev)
 	}
 	else if (feh_is_kp(&keys.zoom_default, keysym, state)) {
 		winwid->zoom = 1.0;
-		/* --scale-down will revert our operation if old_zoom == 1.0 */
-		if (opt.scale_down)
-			winwid->old_zoom = 1.001;
 		winwidget_center_image(winwid);
 		winwidget_render_image(winwid, 0, 0);
-		/* --scale-down will also do weird stuff if zoom is 1.0 */
-		if (opt.scale_down)
-			winwid->zoom = 1.001;
 	}
 	else if (feh_is_kp(&keys.zoom_fit, keysym, state)) {
 		feh_calc_needed_zoom(&winwid->zoom, winwid->im_w, winwid->im_h, winwid->w, winwid->h);