X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-context.c;h=0492ecbfacd3d51e92537a322772727b6839079f;hb=bc54194e4d9ff8f25f7bbb1561b84bee074d8262;hp=48787f79e371c8d223a8173ae69685636e5cbf29;hpb=457c879ff89bc7f1a8864304974999dba54af9ae;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-context.c b/src/afb-context.c
index 48787f79..0492ecbf 100644
--- a/src/afb-context.c
+++ b/src/afb-context.c
@@ -74,7 +74,7 @@ void afb_context_disconnect(struct afb_context *context)
 			ctxClientSetLOA (context->session, context->loa_out);
 			context->loa_changed = 1;
 		}
-		if (!context->closed) {
+		if (context->closing && !context->closed) {
 			ctxClientClose(context->session);
 			context->closed = 1;
 		}
@@ -138,16 +138,19 @@ int afb_context_check_loa(struct afb_context *context, unsigned loa)
 	return context->loa_in >= loa;
 }
 
-void afb_context_change_loa(struct afb_context *context, unsigned loa)
+int afb_context_change_loa(struct afb_context *context, unsigned loa)
 {
-	assert(context->validated);
+	if (!context->validated || loa > 7)
+		return 0;
 
-	if (loa == context->loa_in)
+	if (loa == context->loa_in && !context->loa_changed)
 		context->loa_changing = 0;
 	else {
-		context->loa_changing = 1;
 		context->loa_out = loa & 7;
+		context->loa_changing = 1;
+		context->loa_changed = 0;
 	}
+	return 1;
 }