From 047b10a5217b5845ff6d8976bf2812957a54b196 Mon Sep 17 00:00:00 2001
From: Magnus Lundborg <lundborg.magnus@gmail.com>
Date: Thu, 5 Dec 2013 11:57:09 +0100
Subject: Further improved searching for next frame with data.


diff --git a/src/lib/tng_io.c b/src/lib/tng_io.c
index 32f02ea..99b468c 100644
--- a/src/lib/tng_io.c
+++ b/src/lib/tng_io.c
@@ -18120,7 +18120,8 @@ tng_function_status DECLSPECDLLEXPORT tng_util_trajectory_next_frame_present_dat
                 continue;
             }
         }
-        if(p_data->last_retrieved_frame >= 0)
+        if(frame_set->first_frame != current_frame &&
+           p_data->last_retrieved_frame >= 0)
         {
             data_frame = p_data->last_retrieved_frame + p_data->stride_length;
         }
@@ -18206,7 +18207,8 @@ tng_function_status DECLSPECDLLEXPORT tng_util_trajectory_next_frame_present_dat
                 continue;
             }
         }
-        if(np_data->last_retrieved_frame >= 0)
+        if(frame_set->first_frame != current_frame &&
+           np_data->last_retrieved_frame >= 0)
         {
             data_frame = np_data->last_retrieved_frame + np_data->stride_length;
         }
-- 
cgit v0.10.1