X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2Fengine%2FRowBase.java;h=9104398bdf1675f806d17ae47a52d3ab7b4ab395;hb=319caebfa9fa020c44b61b7014cc8570bc14a2fa;hp=7ac86d0bc9e502dd59ba840891a2822937ea5d80;hpb=6a6d3ea1aec31eb2f7ba0a3fd727b80c96a67868;p=Dictionary.git

diff --git a/src/com/hughes/android/dictionary/engine/RowBase.java b/src/com/hughes/android/dictionary/engine/RowBase.java
index 7ac86d0..9104398 100644
--- a/src/com/hughes/android/dictionary/engine/RowBase.java
+++ b/src/com/hughes/android/dictionary/engine/RowBase.java
@@ -53,8 +53,13 @@ public abstract class RowBase extends IndexedObject {
         }
         if (rUp < index.rows.size()) {
           final RowBase rowUp = index.rows.get(rUp);
-          final TokenRow candidateUp = rowUp.getTokenRow(false);
+          TokenRow candidateUp = rowUp.getTokenRow(false);
           if (candidateUp != null) {
+            // Did we hit the next set of TokenRows?
+            if (candidateUp.index() > this.index()) {  
+              final int tokenIndex = index.sortedIndexEntries.get(candidateUp.referenceIndex - 1).startRow;
+              candidateUp = (TokenRow) index.rows.get(tokenIndex);
+            }
             for (--rUp; rUp >= index(); --rUp) {
               index.rows.get(rUp).setTokenRow(candidateUp);
             }