Index: main/devicestate.c
===================================================================
--- main/devicestate.c	(revision 193186)
+++ main/devicestate.c	(working copy)
@@ -736,7 +736,6 @@
 	agg->all_unavail = 1;
 	agg->all_busy = 1;
 	agg->all_free = 1;
-	agg->all_on_hold = 1;
 }
 
 void ast_devstate_aggregate_add(struct ast_devstate_aggregate *agg, enum ast_device_state state)
@@ -745,21 +744,18 @@
 	case AST_DEVICE_NOT_INUSE:
 		agg->all_unavail = 0;
 		agg->all_busy = 0;
-		agg->all_on_hold = 0;
 		break;
 	case AST_DEVICE_INUSE:
 		agg->in_use = 1;
 		agg->all_busy = 0;
 		agg->all_unavail = 0;
 		agg->all_free = 0;
-		agg->all_on_hold = 0;
 		break;
 	case AST_DEVICE_RINGING:
 		agg->ring = 1;
 		agg->all_busy = 0;
 		agg->all_unavail = 0;
 		agg->all_free = 0;
-		agg->all_on_hold = 0;
 		break;
 	case AST_DEVICE_RINGINUSE:
 		agg->in_use = 1;
@@ -767,23 +763,21 @@
 		agg->all_busy = 0;
 		agg->all_unavail = 0;
 		agg->all_free = 0;
-		agg->all_on_hold = 0;
 		break;
 	case AST_DEVICE_ONHOLD:
 		agg->all_unavail = 0;
 		agg->all_free = 0;
+		agg->on_hold = 0;
 		break;
 	case AST_DEVICE_BUSY:
 		agg->all_unavail = 0;
 		agg->all_free = 0;
-		agg->all_on_hold = 0;
 		agg->busy = 1;
 		break;
 	case AST_DEVICE_UNAVAILABLE:
 	case AST_DEVICE_INVALID:
 		agg->all_busy = 0;
 		agg->all_free = 0;
-		agg->all_on_hold = 0;
 		break;
 	case AST_DEVICE_UNKNOWN:
 		break;
@@ -795,9 +789,6 @@
 	if (agg->all_free)
 		return AST_DEVICE_NOT_INUSE;
 	
-	if (agg->all_on_hold)
-		return AST_DEVICE_ONHOLD;
-	
 	if (agg->all_busy)
 		return AST_DEVICE_BUSY;
 
@@ -812,6 +803,9 @@
 
 	if (agg->busy)
 		return AST_DEVICE_BUSY;
+
+	if (agg->on_hold)
+		return AST_DEVICE_ONHOLD;
 	
 	return AST_DEVICE_NOT_INUSE;
 }