Commit 114419c4 authored by alex@thinkpad's avatar alex@thinkpad
Browse files

close_liveview: fix "exiting" movie mode, including special case for 5D2/50D

--HG--
branch : lua_fix
parent e65c0e355242
...@@ -253,10 +253,19 @@ void close_liveview() ...@@ -253,10 +253,19 @@ void close_liveview()
} }
#else #else
{ {
/* in photo mode, just exit LiveView by "pressing" the LiveView button */ if (!is_movie_mode()) {
/* in movie mode, pressing LiveView would start recording, /* in photo mode, just exit LiveView by "pressing" the LiveView button */
* so go to PLAY mode instead */ fake_simple_button(BGMT_LV);
fake_simple_button(is_movie_mode() ? BGMT_PLAY : BGMT_LV); } else {
#if defined(CONFIG_5D2) || defined(CONFIG_50D)
/* on these cameras, pressing the LiveView button won't start recording */
fake_simple_button(BGMT_LV);
#else
/* in movie mode, pressing LiveView would start recording,
* so go to PLAY mode instead */
enter_play_mode();
#endif
}
msleep(1000); msleep(1000);
} }
#endif #endif
......
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