# HG changeset patch
# User ethanzonca@localhost.localdomain
# Date 2009-11-24 00:27:01
# Node ID 384331f8928e2bab7898ca1a9ddd0797e022de11
# Parent  1ae1d5e6b9021a34e096d5447ae159117bbbd2ab

Added return to blender_exec

diff --git a/src/server/slave.c b/src/server/slave.c
--- a/src/server/slave.c
+++ b/src/server/slave.c
@@ -171,7 +171,10 @@ int main(int argc, char *argv[])
         free(outputExt);
 
         /* Execute blender */
-        exec_blender(pathtoJobfile, pathtoOutput, framenum); /* @TODO: This warning should be fixed :D */
+        if(exec_blender(pathtoJobfile, pathtoOutput, framenum)){ /* @TODO: This warning should be fixed :D */
+            fprintf(stderr,"Error running Blender. Check your installation and/or your PATH.");
+            return 1;
+        }
         free(pathtoJobfile);
 
         /* When blender is finished, run this... */
diff --git a/src/server/slavefuncs.c b/src/server/slavefuncs.c
--- a/src/server/slavefuncs.c
+++ b/src/server/slavefuncs.c
@@ -213,7 +213,7 @@ return 1; // Success
 /* Executors */
 
 /** Executor function for Blender operations */
-void exec_blender(char *input, char *output, int frame)
+int exec_blender(char *input, char *output, int frame)
 {
   fprintf(stderr,"Preparing to execute...\n");
   int ret;
@@ -240,12 +240,7 @@ void exec_blender(char *input, char *out
     }
   execio_close(testrem);
 
-  if(ret == 1){
-    fprintf(stderr,"Error starting Blender. Check your path and installation.\n");
-  }
-  else{
-    fprintf(stderr,"Execution of Blender was successful.\n");
-  }
+  return ret;
 }
 
 void xmlinit()
diff --git a/src/server/slavefuncs.h b/src/server/slavefuncs.h
--- a/src/server/slavefuncs.h
+++ b/src/server/slavefuncs.h
@@ -36,7 +36,7 @@ int ssh_keygen();
 int register_user(char *username, char *email);
 int login_user(char *username);
 int conf_replace(char *username);
-void exec_blender(char *input, char *output, int frame);
+int exec_blender(char *input, char *output, int frame);
 void xmlinit();
 void xmlcleanup();