This instance will be upgraded to Heptapod 0.31.0 (final) on 2022-05-24 at 14:00 UTC+2 (a few minutes of down time)

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

menu: experimental fix for issue #1974 (timeout in LiveView, 6D/M/100D/70D)

Hypothesis: https://bitbucket.org/hudson/magic-lantern/issues/1974/6df#comment-44206798
Tested on 5D3 with GUI mode 41.
Tested in QEMU on 6D (it keeps poking the MPU while ML menu is open).

--HG--
branch : lua_fix
parent c0dad0168dc4
......@@ -4786,16 +4786,22 @@ static int menu_ensure_canon_dialog()
{
if (redraw_flood_stop)
{
// Canon dialog timed out?
#if defined(CONFIG_MENU_TIMEOUT_FIX)
// force dialog change when canon dialog times out (EOSM, 6D etc)
start_redraw_flood();
SetGUIRequestMode(GUIMODE_ML_MENU);
#else
// Canon dialog changed?
return 0;
#endif
}
}
#if defined(CONFIG_MENU_TIMEOUT_FIX)
// refresh Canon dialog before it times out (EOSM, 6D etc)
// apparently it's the MPU that decides to turn off the underlying Canon dialog
// so we have to keep poking it to stay awake
static int last_refresh = 0;
if (lv && should_run_polling_action(2000, &last_refresh))
{
SetGUIRequestMode(GUIMODE_ML_MENU);
}
#endif
#endif
return 1;
}
......
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