# HG changeset patch
# User Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
# Date 2010-02-19 00:07:57
# Node ID fc1b152b132bf36f684d775084b79de819986b64
# Parent  01df221c59bfe57ee01e607691f626cec6edbbfe

fix semantic and pointer handling errors of normaldotcom

diff --git a/src/server/mysql.c b/src/server/mysql.c
--- a/src/server/mysql.c
+++ b/src/server/mysql.c
@@ -59,12 +59,10 @@ int mysqlResultFree(distrend_mysql_resul
 */
 int distrend_mysql_getint(MYSQL_ROW row, MYSQL_FIELD_OFFSET column, int32_t *theint)
 {
+  if(!row[column])
+    return 1;
 
-  // no frames to render
-  if(!row[0] || !row[1])
-    return 1;
-  else
-    *theint = atol(row[column]);
+  *theint = atol(row[column]);
 
   return 0;
 }
@@ -261,6 +259,8 @@ int find_jobframe(distrend_mysql_conn_t 
   char *query;
   MYSQL_ROW row;
 
+  int rtn;
+
   _distren_asprintf(&query, "CALL `distren`.`Frame_Get`(%d);", slavekey);
 
   result = mysqlQuery(conn, query, 2);
@@ -276,10 +276,10 @@ int find_jobframe(distrend_mysql_conn_t 
       return 1;
     }
 
-  if(distrend_mysql_getint(row, 0, (int32_t *)jobkey) || distrend_mysql_getint(row, 1, framenum))
-    return 1;
+  rtn = distrend_mysql_getint(row, 0, (int32_t *)jobkey);
+  rtn += distrend_mysql_getint(row, 1, framenum);
   
   mysqlResultFree(result);
 
-  return 0;
+  return rtn;
 }