X-Git-Url: http://git.lttng.org/?p=lttv.git;a=blobdiff_plain;f=lttv%2Flttv%2Ftracecontext.c;h=5f6455a42f4be31b1d8bd4db7efba9ebce502e8f;hp=165a890f688d49b539ab7f10860746976a032b59;hb=9a366873e0ed6ecc7f23e2d3a959ecddd4f2f91d;hpb=2dd99ee20f5205f235e36af08b89cbc8252c642e

diff --git a/lttv/lttv/tracecontext.c b/lttv/lttv/tracecontext.c
index 165a890f..5f6455a4 100644
--- a/lttv/lttv/tracecontext.c
+++ b/lttv/lttv/tracecontext.c
@@ -693,13 +693,14 @@ guint lttv_process_traceset_middle(LttvTracesetContext *self,
 	
 	unsigned count = 0;
 		
+        gint last_ret = 0;
 	struct bt_ctf_event *bt_event;
 	
 	LttvEvent event;
 
 	while(TRUE) {
 
-		if((count >= nb_events) && (nb_events != G_MAXULONG)) {
+		if(last_ret == TRUE || ((count >= nb_events) && (nb_events != G_MAXULONG))) {
 			break;
 		}
 
@@ -712,7 +713,7 @@ guint lttv_process_traceset_middle(LttvTracesetContext *self,
 			   to retrieve the right state container */
 			event.state = self->tmpState;
 			
-			lttv_hooks_call(self->event_hooks, &event);
+			last_ret = lttv_hooks_call(self->event_hooks, &event);
 
 			if(bt_iter_next(bt_ctf_get_iter(self->iter)) < 0) {
 				printf("ERROR NEXT\n");