Read about our upcoming Code of Conduct on this issue

Commit c21ce4a2 authored by a1ex's avatar a1ex
Browse files

Fixed some small LCD remote bugs

--HG--
branch : 550d
parent 6a60c978d5eb
......@@ -2495,6 +2495,9 @@ void remote_shot()
else
lens_take_picture(64); // hdr_shot messes with the self timer mode
}
msleep(200);
if (get_mlu() && lens_info.job_state < 10) return;
while (lens_info.job_state >= 10) msleep(500);
msleep(1000);
......@@ -2624,13 +2627,13 @@ PROP_HANDLER(PROP_DISPSENSOR_CTRL)
if (remote_shot_flag) goto end;
if (lcd_release_running && lens_info.job_state < 10 && gui_state == GUISTATE_IDLE && !intervalometer_running)
if (lcd_release_running && gui_state == GUISTATE_IDLE && !intervalometer_running)
{
if (gui_menu_shown()) goto end;
if (lcd_release_running == 1 && off) goto end;
if (lcd_release_running == 2 && on && !get_mlu()) goto end;
if (lcd_release_running == 3) { wave_count++; wave_count_countdown = 75; }
if (lcd_release_running == 3) { wave_count++; wave_count_countdown = 50; }
if (lcd_release_running == 3 && wave_count < 5) goto end;
if (lcd_release_running == 3 && recording) schedule_movie_end(); // wave mode is allowed to stop movies
......
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