X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Frender.C;h=faa62ddba9e878ae0b55c9667dbc8c2bdf456aad;hp=ff21962f6063776b5524dc0b9518c2a9de23c812;hb=e8453fdab4d5ed7b384279a5b37c92010ac13295;hpb=94fc059e6ed3f77f20531338cbb03bdb3b4d9eab diff --git a/cinelerra-5.1/cinelerra/render.C b/cinelerra-5.1/cinelerra/render.C index ff21962f..faa62ddb 100644 --- a/cinelerra-5.1/cinelerra/render.C +++ b/cinelerra-5.1/cinelerra/render.C @@ -736,7 +736,8 @@ void RenderThread::render_single(int test_overwrite, Asset *asset, EDL *edl, render->total_rendered = 0; - if( !render->result ) { + if( !render->result && + ( strategy == SINGLE_PASS_FARM || strategy == FILE_PER_LABEL_FARM ) ) { // Start dispatching external jobs if( mwindow ) { mwindow->gui->lock_window("Render::render 1"); @@ -748,24 +749,22 @@ void RenderThread::render_single(int test_overwrite, Asset *asset, EDL *edl, printf("Render::render: starting render farm\n"); } - if( strategy == SINGLE_PASS_FARM || strategy == FILE_PER_LABEL_FARM ) { - farm_server = new RenderFarmServer(mwindow, render->packages, - render->preferences, 1, &render->result, - &render->total_rendered, render->counter_lock, - render->default_asset, command->get_edl(), 0); - render->result = farm_server->start_clients(); - - if( render->result ) { - if( mwindow ) { - mwindow->gui->lock_window("Render::render 2"); - mwindow->gui->show_message(_("Failed to start render farm"), - mwindow->theme->message_error); - mwindow->gui->stop_hourglass(); - mwindow->gui->unlock_window(); - } - else { - printf("Render::render: Failed to start render farm\n"); - } + farm_server = new RenderFarmServer(mwindow, render->packages, + render->preferences, 1, &render->result, + &render->total_rendered, render->counter_lock, + render->default_asset, command->get_edl(), 0); + render->result = farm_server->start_clients(); + + if( render->result ) { + if( mwindow ) { + mwindow->gui->lock_window("Render::render 2"); + mwindow->gui->show_message(_("Failed to start render farm"), + mwindow->theme->message_error); + mwindow->gui->stop_hourglass(); + mwindow->gui->unlock_window(); + } + else { + printf("Render::render: Failed to start render farm\n"); } } }