Changeset 10011 for ps

Timestamp:

08/16/11 03:01:39 (13 years ago)

Author:

kennethalong

Message:

Fixes #898

File:

• ps/trunk/source/gui/CInput.cpp (modified) (3 diffs)

ps/trunk/source/gui/CInput.cpp

@@ -790 +790 @@
         {
             CStrW *pCaption = (CStrW*)m_Settings["caption"].m_pSetting;
+
+            if (pCaption->length() == 0)
+                break;
+
             m_iBufferPos = m_iBufferPos_Tail = GetMouseHoveringTextPosition();
+
+
+            if (m_iBufferPos >= pCaption->length())
+                m_iBufferPos = m_iBufferPos_Tail = pCaption->length() - 1;
+
 
             // See if we are clicking over whitespace
@@ -831 +840 @@
                             break;
                     }
+
+                    if (m_iBufferPos_Tail == pCaption->length())
+                        break;
+
                     // now go to the right until we hit whitespace or punctuation
                     while (++m_iBufferPos_Tail < (int)pCaption->length())
@@ -846 +859 @@
                             break;
                     }
+
+                    if (m_iBufferPos_Tail == pCaption->length())
+                        break;
 
                     // Don't include the leading whitespace