18 new shapewipe transitions from rafa, rework savefile/confirm for nested edl edits

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / main.C

diff --git a/cinelerra-5.1/cinelerra/main.C b/cinelerra-5.1/cinelerra/main.C
index 4b04a11b2f6347b17a08831a6a19d822d12916f0..8a4815f9eb32d469189a6e30fd963ce67b34e826 100644 (file)
--- a/cinelerra-5.1/cinelerra/main.C
+++ b/cinelerra-5.1/cinelerra/main.C
@@ -106,7 +106,8 @@ public:
 //PRINT_TRACE
                mwindow->gui->lock_window("main");
 //PRINT_TRACE
-               mwindow->load_filenames(filenames, LOADMODE_REPLACE);
+               mwindow->load_filenames(filenames,
+                       LOADMODE_REPLACE, LOADMODE_EDL_CLIP);
 //PRINT_TRACE
                if( filenames->size() == 1 )
                        mwindow->gui->mainmenu->add_load(filenames->get(0));
@@ -362,7 +363,7 @@ int main(int argc, char *argv[])
                                MWindow mwindow;
                                mwindow.create_objects(1, !filenames.total, config_path);
                                CommandLineThread *thread  = 0;
-                               if( mwindow.preferences->perpetual_session && load_perpetual )
+                               if( load_perpetual )
                                        mwindow.load_undo_data();
 //SET_TRACE
 // load the initial files on seperate tracks
@@ -398,8 +399,7 @@ int main(int argc, char *argv[])
                                        done = 1;
 
                                mwindow.save_defaults();
-                               if( mwindow.preferences->perpetual_session )
-                                       mwindow.save_undo_data();
+                               mwindow.save_undo_data();
 //PRINT_TRACE
                                filenames.remove_all_objects();
                                delete thread;