diff --git a/src/server/distrend.c b/src/server/distrend.c --- a/src/server/distrend.c +++ b/src/server/distrend.c @@ -444,8 +444,10 @@ int interactiveTest(int test, struct gen fprintf(stderr,"Slave Key: "); scanf("%d", &slaveKey); fprintf(stderr, "Got frame: "); - find_jobframe(conn, slaveKey, &jobKey, &frameNum); - fprintf(stderr, "jobKey: %d, frameNum: %d\n",jobKey,frameNum); + if(find_jobframe(conn, slaveKey, &jobKey, &frameNum)) + fprintf(stderr,"No frames available to render!\n"); + else + fprintf(stderr, "jobKey: %d, frameNum: %d\n",jobKey,frameNum); break; case 2: fprintf(stderr,"Job key: "); diff --git a/src/server/mysql.c b/src/server/mysql.c --- a/src/server/mysql.c +++ b/src/server/mysql.c @@ -60,9 +60,11 @@ int mysqlResultFree(distrend_mysql_resul int distrend_mysql_getint(MYSQL_ROW row, MYSQL_FIELD_OFFSET column, int32_t *theint) { -if(!row[0] || !row[1]) - fprintf(stderr, "Columns are null!\n"); - *theint = atol(row[column]); + // no frames to render + if(!row[0] || !row[1]) + return 1; + else + *theint = atol(row[column]); return 0; } @@ -274,10 +276,8 @@ int find_jobframe(distrend_mysql_conn_t return 1; } - distrend_mysql_getint(row, 0, (int32_t *)jobkey); - distrend_mysql_getint(row, 1, framenum); - - + if(distrend_mysql_getint(row, 0, (int32_t *)jobkey) || distrend_mysql_getint(row, 1, framenum)) + return 1; mysqlResultFree(result);