projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
port 7.2 mods: align_edits foreground plugin refresh_frame tweak, rework soundlevel...
[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 ab7efaf5b7c4a11c91ff08fdbc9c826e292a2bb1..c9151e67b03d8516b446f4a2aeef821cb0cc1c67 100644
(file)
--- a/
cinelerra-5.1/cinelerra/clippopup.C
+++ b/
cinelerra-5.1/cinelerra/clippopup.C
@@
-344,8
+344,7
@@
ClipPopupDelete::~ClipPopupDelete()
int ClipPopupDelete::handle_event()
{
popup->gui->unlock_window();
int ClipPopupDelete::handle_event()
{
popup->gui->unlock_window();
- mwindow->remove_assets_from_project(1, 1,
- mwindow->session->drag_assets,
+ mwindow->remove_assets_from_project(1, 1, 0, 0,
mwindow->session->drag_clips);
popup->gui->lock_window("ClipPopupDelete::handle_event");
return 1;
mwindow->session->drag_clips);
popup->gui->lock_window("ClipPopupDelete::handle_event");
return 1;
@@
-379,7
+378,7
@@
int ClipPasteToFolder::handle_event()
}
else {
char *cp = strchr(string, '\n');
}
else {
char *cp = strchr(string, '\n');
- if( cp-string < 32 ) *cp = 0;
+ if( cp
&& cp
-string < 32 ) *cp = 0;
else if( len > 32 ) string[32] = 0;
eprintf("paste buffer is not EDL:\n%s", string);
}
else if( len > 32 ) string[32] = 0;
eprintf("paste buffer is not EDL:\n%s", string);
}