From: Abdelrazak Younes <younes@lyx.org>
Date: Tue, 30 Jan 2007 13:54:28 +0000 (+0000)
Subject: Fix bug 3177:
X-Git-Tag: 1.6.10~10990
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=c0fad8643120a2a6fd9d62f7ab226798274b1cbb;p=features.git

Fix bug 3177:

http://bugzilla.lyx.org/show_bug.cgi?id=3177


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16949 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/TocBackend.C b/src/TocBackend.C
index fd714ce562..1101b968d9 100644
--- a/src/TocBackend.C
+++ b/src/TocBackend.C
@@ -203,6 +203,9 @@ TocIterator const TocBackend::item(
 	Toc const & toc_vector = toclist_it->second;
 	TocIterator last = toc_vector.begin();
 	TocIterator it = toc_vector.end();
+	if (it == last)
+		return it;
+
 	--it;
 
 	for (; it != last; --it) {
diff --git a/src/frontends/qt4/QToc.C b/src/frontends/qt4/QToc.C
index 840ce3a962..eeec2489aa 100644
--- a/src/frontends/qt4/QToc.C
+++ b/src/frontends/qt4/QToc.C
@@ -92,7 +92,7 @@ QModelIndex const QToc::getCurrentIndex()
 {
 	vector<string> const & types = getTypes();
 	TocIterator const it = getCurrentTocItem(types[type_]);
-	if (!it->isValid()) {
+	if (it == getContents(types[type_]).end() || !it->isValid()) {
 		lyxerr[Debug::GUI] << "QToc::getCurrentIndex(): TocItem is invalid!" << endl;
 		return QModelIndex();
 	}