Commits

a1ex committed 7bc4e30

FPS override: safeguards to avoid conflicts with picture taking

Comments (0)

Files changed (1)

 {
     if (!lv) return;
     if (!DISPLAY_IS_ON) return;
+    if (lens_info.job_state) return;
     if (!fps_x1000) return;
 
     fps_needs_updating = 0;
 // don't msleep from here, it may be called from GMT
 static void fps_register_reset()
 {
+    if (!lv) return;
+    if (!DISPLAY_IS_ON) return;
+    if (lens_info.job_state) return;
+
     if (fps_reg_a_orig && fps_reg_b_orig)
     {
         written_value_a = 0;
 
 void fps_setup_timerA(int fps_x1000)
 {
+    if (!lv) return;
+    if (!DISPLAY_IS_ON) return;
+    if (!fps_x1000) return;
+    if (lens_info.job_state) return;
+
     // for NTSC, we probably need FPS * 1000/1001
     int ntsc = is_current_mode_ntsc();
     ntsc += 0; // bypass warning
 
         if (!lv) continue;
         if (!DISPLAY_IS_ON) continue;
+        if (lens_info.job_state) continue;
         
         fps_read_current_timer_values();