X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Frenderfarmclient.C;h=24eee2a6af6cf970fc5ff6d99e4278dd2885cc83;hb=af9d4868955bf1c521383795e55d29a2d4d05db2;hp=7a3507a87f0e5e988e332f202e6917669070b3a8;hpb=9db053d413fde01439cc72ec2109913dfda2ec7b;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/renderfarmclient.C b/cinelerra-5.1/cinelerra/renderfarmclient.C
index 7a3507a8..24eee2a6 100644
--- a/cinelerra-5.1/cinelerra/renderfarmclient.C
+++ b/cinelerra-5.1/cinelerra/renderfarmclient.C
@@ -552,10 +552,12 @@ void RenderFarmClientThread::run()
 // Get the pid of the fork if inside the fork
 	pid = getpid();
 	BC_Signals::set_trap_hook(trap_hook, this);
+	TheList::reset();
 
 	int socket_fd = this->socket_fd;
-
-	init_client_keepalive();
+	int watchdog_timeout = client->boot_preferences->renderfarm_watchdog_timeout;
+	if( watchdog_timeout > 0 )
+		init_client_keepalive(watchdog_timeout);
 
 // Get command to run
 	int command;
@@ -579,11 +581,11 @@ void RenderFarmClientThread::run()
 }
 
 
-void RenderFarmClientThread::init_client_keepalive()
+void RenderFarmClientThread::init_client_keepalive(int timeout_secs)
 {
 	keep_alive = new RenderFarmKeepalive(this);
 	keep_alive->start();
-	watchdog = new RenderFarmWatchdog(0, this);
+	watchdog = new RenderFarmWatchdog(timeout_secs, 0, this);
 	watchdog->start();
 }
 
@@ -711,8 +713,7 @@ void RenderFarmKeepalive::run()
 		enable_cancel();
 		sleep(5);
 		disable_cancel();
-		if(!done)
-		{
+		if( !done ) {
 //printf("RenderFarmKeepalive::run 1\n");
 // watchdog thread kills this if it gets stuck
 			client_thread->ping_server();