projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version update
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
clippopup.C
diff --git
a/cinelerra-5.1/cinelerra/clippopup.C
b/cinelerra-5.1/cinelerra/clippopup.C
index 65eebb61e889f642a58eb3990c709ab4e476b8b0..d473e195af2d2331d535c282f0eb9214d0282e7a 100644
(file)
--- a/
cinelerra-5.1/cinelerra/clippopup.C
+++ b/
cinelerra-5.1/cinelerra/clippopup.C
@@
-439,10
+439,10
@@
ClipPopupToMedia::~ClipPopupToMedia()
int ClipPopupToMedia::handle_event()
{
int ClipPopupToMedia::handle_event()
{
- if( mwindow->edl->session->proxy_s
cale == 1
)
+ if( mwindow->edl->session->proxy_s
tate != PROXY_ACTIVE
)
mwindow->clip_to_media();
else
mwindow->clip_to_media();
else
- eprintf("Nesting not allowed when proxy
scale != 1
");
+ eprintf("Nesting not allowed when proxy
active
");
return 1;
}
return 1;
}