projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix awdw solo vicon crash, fix nested clip for binfolders, open edit edl
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
loadfile.C
diff --git
a/cinelerra-5.1/cinelerra/loadfile.C
b/cinelerra-5.1/cinelerra/loadfile.C
index a946077393e514a2e007379a7187b92a77f0a758..dce124911df4b2bb5b5505ac84350b12940f407d 100644
(file)
--- a/
cinelerra-5.1/cinelerra/loadfile.C
+++ b/
cinelerra-5.1/cinelerra/loadfile.C
@@
-136,23
+136,19
@@
void LoadFileThread::load_apply()
// No file selected
if( !path_list.size() ) return;
// No file selected
if( !path_list.size() ) return;
+ int replaced = load_mode == LOADMODE_REPLACE ||
+ load_mode == LOADMODE_REPLACE_CONCATENATE ? 1 : 0;
mwindow->interrupt_indexes();
mwindow->gui->lock_window("LoadFileThread::run");
mwindow->interrupt_indexes();
mwindow->gui->lock_window("LoadFileThread::run");
- mwindow->load_filenames(&path_list, load_mode, edl_mode,
0
);
+ mwindow->load_filenames(&path_list, load_mode, edl_mode,
replaced
);
mwindow->gui->mainmenu->add_load(path_list.values[0]);
mwindow->gui->unlock_window();
path_list.remove_all_objects();
mwindow->save_backup();
mwindow->gui->mainmenu->add_load(path_list.values[0]);
mwindow->gui->unlock_window();
path_list.remove_all_objects();
mwindow->save_backup();
-
mwindow->restart_brender();
mwindow->restart_brender();
-
- if( load_mode == LOADMODE_REPLACE ||
- load_mode == LOADMODE_REPLACE_CONCATENATE )
- mwindow->session->changes_made = 0;
- else
- mwindow->session->changes_made = 1;
+ mwindow->session->changes_made = !replaced ? 1 : 0;
}
}