Index: /trunk/core/shooting.c
===================================================================
--- /trunk/core/shooting.c	(revision 1810)
+++ /trunk/core/shooting.c	(revision 1811)
@@ -333,5 +333,8 @@
 int shooting_get_subject_distance_override_value()
 {
-  return (conf.subj_dist_override_value < shooting_get_lens_to_focal_plane_width()?0:(conf.subj_dist_override_value - shooting_get_lens_to_focal_plane_width()));
+    if (conf.subj_dist_override_value != INFINITY_DIST)
+        return (conf.subj_dist_override_value < shooting_get_lens_to_focal_plane_width()?0:(conf.subj_dist_override_value - shooting_get_lens_to_focal_plane_width()));
+    else
+        return INFINITY_DIST;
 }
 
@@ -1074,5 +1077,5 @@
                 s=shooting_get_near_limit_f(v,shooting_get_min_real_aperture(),get_focal_length(lens_get_zoom_point()));
             }
-            if (!conf.dof_use_exif_subj_dist) 
+            if (!conf.dof_use_exif_subj_dist && (s != INFINITY_DIST)) 
                 s+=shooting_get_lens_to_focal_plane_width();
             lens_set_focus_pos(s);