Commit cebbdb99 authored by alex@thinkpad's avatar alex@thinkpad
Browse files

Focus tools: refuse to run if continuous AF is enabled in Canon menu

--HG--
branch : lua_fix
parent 4b47c20c2924
...@@ -93,6 +93,7 @@ int is_follow_focus_active() ...@@ -93,6 +93,7 @@ int is_follow_focus_active()
if (!follow_focus) return 0; if (!follow_focus) return 0;
if (!lv) return 0; if (!lv) return 0;
if (is_manual_focus()) return 0; if (is_manual_focus()) return 0;
if (is_continuous_af()) return 0;
if (!liveview_display_idle()) return 0; if (!liveview_display_idle()) return 0;
if (gui_menu_shown()) return 0; if (gui_menu_shown()) return 0;
#ifdef FEATURE_LCD_SENSOR_SHORTCUTS #ifdef FEATURE_LCD_SENSOR_SHORTCUTS
...@@ -1343,6 +1344,7 @@ int handle_follow_focus_save_restore(struct event * event) ...@@ -1343,6 +1344,7 @@ int handle_follow_focus_save_restore(struct event * event)
{ {
if (!lv) return 1; if (!lv) return 1;
if (is_manual_focus()) return 1; if (is_manual_focus()) return 1;
if (is_continuous_af()) return 1;
if (RECORDING && !gui_menu_shown()) if (RECORDING && !gui_menu_shown())
{ {
...@@ -1369,6 +1371,7 @@ int handle_rack_focus_menu_overrides(struct event * event) ...@@ -1369,6 +1371,7 @@ int handle_rack_focus_menu_overrides(struct event * event)
#ifdef FEATURE_RACK_FOCUS #ifdef FEATURE_RACK_FOCUS
if (!lv) return 1; if (!lv) return 1;
if (is_manual_focus()) return 1; if (is_manual_focus()) return 1;
if (is_continuous_af()) return 1;
if (!should_override_zoom_buttons()) return 1; if (!should_override_zoom_buttons()) return 1;
if (gui_menu_shown() && is_menu_active("Focus")) if (gui_menu_shown() && is_menu_active("Focus"))
......
...@@ -660,6 +660,7 @@ lens_focus( ...@@ -660,6 +660,7 @@ lens_focus(
if (!lv) return 0; if (!lv) return 0;
if (is_manual_focus()) return 0; if (is_manual_focus()) return 0;
if (is_continuous_af()) return 0;
if (num_steps < 0) if (num_steps < 0)
{ {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment