projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
render effect segv, drag chkbox track coords, check mask active,
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
mwindowedit.C
diff --git
a/cinelerra-5.1/cinelerra/mwindowedit.C
b/cinelerra-5.1/cinelerra/mwindowedit.C
index fc0ee88ed681c098b8eb70965ddc277f306f4a02..9e5b5012003c9150a41eac4d87c27b2a340d8089 100644
(file)
--- a/
cinelerra-5.1/cinelerra/mwindowedit.C
+++ b/
cinelerra-5.1/cinelerra/mwindowedit.C
@@
-1319,7
+1319,8
@@
void MWindow::load_assets(ArrayList<Indexable*> *new_assets,
load_mode = LOADMODE_ASSETSONLY;
const int debug = 0;
if( debug ) printf("MWindow::load_assets %d\n", __LINE__);
load_mode = LOADMODE_ASSETSONLY;
const int debug = 0;
if( debug ) printf("MWindow::load_assets %d\n", __LINE__);
- if( position < 0 ) position = edl->local_session->get_selectionstart();
+ if( position < 0 )
+ position = edl->local_session->get_selectionstart();
ArrayList<EDL*> new_edls;
for( int i=0; i<new_assets->total; ++i ) {
ArrayList<EDL*> new_edls;
for( int i=0; i<new_assets->total; ++i ) {
@@
-1543,7
+1544,10
@@
int MWindow::paste_edls(ArrayList<EDL*> *new_edls, int load_mode,
switch( load_mode ) {
case LOADMODE_REPLACE:
current_position = 0;
switch( load_mode ) {
case LOADMODE_REPLACE:
current_position = 0;
+ break;
case LOADMODE_NEW_TRACKS:
case LOADMODE_NEW_TRACKS:
+ if( !overwrite )
+ current_position = 0;
break;
case LOADMODE_CONCATENATE:
break;
case LOADMODE_CONCATENATE: