diff --git a/Makefile b/Makefile index 25a904ca..ab15be67 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ MXQ_VERSION_MAJOR = 0 MXQ_VERSION_MINOR = 26 -MXQ_VERSION_PATCH = 5 +MXQ_VERSION_PATCH = 6 MXQ_VERSION_EXTRA = "beta" MXQ_VERSIONDATE = 2016 diff --git a/mxqd.c b/mxqd.c index 7274b9e1..efa864d9 100644 --- a/mxqd.c +++ b/mxqd.c @@ -1428,10 +1428,10 @@ unsigned long start_user(struct mxq_user_list *ulist, long slots_to_start) group = &glist->group; - if (glist->jobs_running == group->group_jobs) { + if (glist->jobs_running >= group->group_jobs) { continue; } - if (glist->jobs_running == glist->jobs_max) { + if (glist->jobs_running >= glist->jobs_max) { continue; } if (mxq_group_jobs_inq(group) == 0) { diff --git a/mxqd.h b/mxqd.h index f21d5fd2..bec7fabc 100644 --- a/mxqd.h +++ b/mxqd.h @@ -44,9 +44,6 @@ struct mxq_group_list { unsigned long global_threads_running; unsigned long global_slots_running; - int server_is_qualified_evaluated; - int server_is_qualified; - short orphaned; }; diff --git a/mxqd_control.c b/mxqd_control.c index 44b4b49d..e6319549 100644 --- a/mxqd_control.c +++ b/mxqd_control.c @@ -137,9 +137,6 @@ static void _group_list_init(struct mxq_group_list *glist) glist->slots_max = slots_max; glist->memory_max = memory_max; - glist->server_is_qualified_evaluated = 0; - glist->server_is_qualified = 0; - glist->orphaned = 0; }