fix a/v module nested command setup

diff --git a/cinelerra-5.1/cinelerra/amodule.C b/cinelerra-5.1/cinelerra/amodule.C
index c45935e5aff9ae3c04c322d21ac3a36106c9f038..5de58f4e3a49d21e45ea620fe0fed9e84204cf40 100644 (file)
--- a/cinelerra-5.1/cinelerra/amodule.C
+++ b/cinelerra-5.1/cinelerra/amodule.C
@@ -281,13 +281,12 @@ int AModule::import_samples(AEdit *edit,
                edit_sample_rate = nested_edl->session->sample_rate;
                int command = direction == PLAY_REVERSE ?
                        NORMAL_REWIND : NORMAL_FWD;
-               if( !nested_command ) {
+               if( !nested_command )
                        nested_command = new TransportCommand;
-                       nested_command->command = command;
-                       nested_command->get_edl()->copy_all(nested_edl);
-                       nested_command->change_type = CHANGE_ALL;
-                       nested_command->realtime = renderengine->command->realtime;
-               }
+               nested_command->command = command;
+               nested_command->get_edl()->copy_all(nested_edl);
+               nested_command->change_type = CHANGE_ALL;
+               nested_command->realtime = renderengine->command->realtime;
                if( !nested_renderengine ) {
                        nested_renderengine = new RenderEngine(0, get_preferences(), 0, 1);
                        nested_renderengine->set_acache(get_cache());

diff --git a/cinelerra-5.1/cinelerra/vmodule.C b/cinelerra-5.1/cinelerra/vmodule.C
index 6659dd4529e5305b11a053fc4b9c4b6ee47b9a03..2239ec20e99a1b9f4c402c45e3b89db5d2a7f141 100644 (file)
--- a/cinelerra-5.1/cinelerra/vmodule.C
+++ b/cinelerra-5.1/cinelerra/vmodule.C
@@ -176,21 +176,15 @@ int VModule::import_frame(VFrame *output, VEdit *current_edit,
                                delete nested_renderengine;
                                nested_renderengine = 0;
                        }
-
-                       if( !nested_command ) {
+                       if( !nested_command )
                                nested_command = new TransportCommand;
-                       }
-
-
-                       if( !nested_renderengine ) {
-                               nested_command->command = command;
-                               nested_command->get_edl()->copy_all(nested_edl);
-                               nested_command->change_type = CHANGE_ALL;
-                               nested_command->realtime = renderengine->command->realtime;
-                               nested_renderengine = new RenderEngine(0, get_preferences(), 0, 1);
-                               nested_renderengine->set_vcache(get_cache());
-                               nested_renderengine->arm_command(nested_command);
-                       }
+                       nested_command->command = command;
+                       nested_command->get_edl()->copy_all(nested_edl);
+                       nested_command->change_type = CHANGE_ALL;
+                       nested_command->realtime = renderengine->command->realtime;
+                       nested_renderengine = new RenderEngine(0, get_preferences(), 0, 1);
+                       nested_renderengine->set_vcache(get_cache());
+                       nested_renderengine->arm_command(nested_command);
                }
                else {