From f38929164112f780240239e56a8d6db2ea8e4e14 Mon Sep 17 00:00:00 2001 From: cxl Date: Thu, 22 Apr 2010 07:32:52 +0000 Subject: [PATCH] *ArrayCtrl: Fixed Find(Null) with disabled lines issue git-svn-id: svn://ultimatepp.org/upp/trunk@2330 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/CtrlLib/ArrayCtrl.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/uppsrc/CtrlLib/ArrayCtrl.cpp b/uppsrc/CtrlLib/ArrayCtrl.cpp index 3f219ab1a..a9b5fb171 100644 --- a/uppsrc/CtrlLib/ArrayCtrl.cpp +++ b/uppsrc/CtrlLib/ArrayCtrl.cpp @@ -2106,7 +2106,7 @@ int ArrayCtrl::Find(const Value& v, int ii, int i) const { ASSERT(ii >= 0); int n = GetCount(); while(i < n) { - if(Get(i, ii) == v) return i; + if(IsLineEnabled(i) && Get(i, ii) == v) return i; i++; } return -1; @@ -2120,7 +2120,6 @@ bool ArrayCtrl::FindSetCursor(const Value& val, int ii, int i) { i = Find(val, ii, i); if(i < 0) return false; if(!SetCursor(i)) return false; -// CenterCursor(); //cxl: 2008-10-06: not what is expected... return true; }