Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
magic-lantern
magic-lantern
Commits
64666b019e52
Commit
114419c4
authored
Sep 03, 2018
by
alex@thinkpad
Browse files
close_liveview: fix "exiting" movie mode, including special case for 5D2/50D
--HG-- branch : lua_fix
parent
e65c0e355242
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/movtweaks.c
View file @
64666b01
...
...
@@ -253,10 +253,19 @@ void close_liveview()
}
#else
{
/* in photo mode, just exit LiveView by "pressing" the LiveView button */
/* in movie mode, pressing LiveView would start recording,
* so go to PLAY mode instead */
fake_simple_button
(
is_movie_mode
()
?
BGMT_PLAY
:
BGMT_LV
);
if
(
!
is_movie_mode
())
{
/* in photo mode, just exit LiveView by "pressing" the LiveView button */
fake_simple_button
(
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
);
}
#endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment