From ea1e5d205e282a47471e478e1ce5a00466180333 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Tue, 21 Apr 2009 23:30:22 +0000
Subject: [PATCH] fix cursor position at beginning of text

---
 panda/src/text/textAssembler.cxx | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/panda/src/text/textAssembler.cxx b/panda/src/text/textAssembler.cxx
index ad8b1ca4d9..23ca6868a1 100644
--- a/panda/src/text/textAssembler.cxx
+++ b/panda/src/text/textAssembler.cxx
@@ -416,6 +416,12 @@ calc_r_c(int &r, int &c, int n) const {
       c = _text_block[r]._string.size();
     }
     return true;
+
+  } else if (n == 0) {
+    // Another special case for the beginning.
+    r = 0;
+    c = 0;
+    return true;
   }
 
   r = 0;
@@ -427,12 +433,8 @@ calc_r_c(int &r, int &c, int n) const {
   const TextRow &row = _text_block[r];
   bool is_real_char = true;
 
-  if (n == 0) {
-    // If there are no characters before n, no need to mess with soft
-    // hyphens.
-    c = row._string.size();
-    
-  } else if (row._got_soft_hyphens) {
+  nassertr(n > 0, false);
+  if (row._got_soft_hyphens) {
     // If there are any soft hyphen or soft break keys in the source
     // text, we have to scan past them to get c precisely.
     c = 0;