netrender:

sensible timeout on connection attempt
fix for operator api change

2 files changed, 3 insertions, 3 deletions

diff --git a/release/scripts/io/netrender/operators.py b/release/scripts/io/netrender/operators.py
index f667be68c84..4c027436560 100644
--- a/release/scripts/io/netrender/operators.py
+++ b/release/scripts/io/netrender/operators.py
@@ -104,7 +104,7 @@ class RENDER_OT_netclientanim(bpy.types.Operator):
             scene.network_render.job_id = client.clientSendJob(conn, scene, True)
             conn.close()
 
-        bpy.ops.screen.render('INVOKE_AREA', animation=True)
+        bpy.ops.render.render('INVOKE_AREA', animation=True)
 
         return {'FINISHED'}
 
@@ -121,7 +121,7 @@ class RENDER_OT_netclientrun(bpy.types.Operator):
         return True
 
     def execute(self, context):
-        bpy.ops.screen.render('INVOKE_AREA', animation=True)
+        bpy.ops.render.render('INVOKE_AREA', animation=True)
 
         return {'FINISHED'}
 
diff --git a/release/scripts/io/netrender/utils.py b/release/scripts/io/netrender/utils.py
index 1d35ea00c99..fdf788daceb 100644
--- a/release/scripts/io/netrender/utils.py
+++ b/release/scripts/io/netrender/utils.py
@@ -110,7 +110,7 @@ def clientConnection(address, port, report = None, scan = True):
             return None
 
     try:
-        conn = http.client.HTTPConnection(address, port)
+        conn = http.client.HTTPConnection(address, port, timeout = 5)
 
         if conn:
             if clientVerifyVersion(conn):