From e6ad0be3bd8079660f1f317827c65856e9ea26d8 Mon Sep 17 00:00:00 2001
From: Matthew Fidler <matthew.fidler@gmail.com>
Date: Mon, 2 Dec 2024 16:02:49 -0600
Subject: [PATCH] ind->tlastS[ind->cmt] != _time

---
 inst/include/rxode2parseHandleEvid.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/inst/include/rxode2parseHandleEvid.h b/inst/include/rxode2parseHandleEvid.h
index 6f12034bb..c99ae4e18 100644
--- a/inst/include/rxode2parseHandleEvid.h
+++ b/inst/include/rxode2parseHandleEvid.h
@@ -248,9 +248,10 @@ static inline void handleTlastInline(double *time, rx_solving_options_ind *ind)
   } else {
     evid = getEvid(ind, ind->ix[ind->idx]);
   }
-  if (op->neq + op->extraCmt != 0 && ind->tlastS[ind->cmt] != _time &&
+  if (op->neq + op->extraCmt != 0 &&
       isDose(evid) &&
-      ind->cmt < op->neq + op->extraCmt) {
+      ind->cmt < op->neq + op->extraCmt &&
+      ind->tlastS[ind->cmt] != _time) {
     double curDose = getDoseIndex(ind, ind->idx), tinf = NA_REAL;
     if (handleTlastInlineUpateDosingInformation(ind, &curDose, &tinf) == 0) return;
     ind->dosenum++;