From 9f02e86e00bc7fd837fa53e4e333481456f05220 Mon Sep 17 00:00:00 2001 From: Allan Odgaard Date: Thu, 10 Jan 2013 21:00:06 +0100 Subject: [PATCH] Cap document array index --- Frameworks/DocumentWindow/src/DocumentController.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Frameworks/DocumentWindow/src/DocumentController.mm b/Frameworks/DocumentWindow/src/DocumentController.mm index 1ab69c22..c5ce652d 100644 --- a/Frameworks/DocumentWindow/src/DocumentController.mm +++ b/Frameworks/DocumentWindow/src/DocumentController.mm @@ -169,7 +169,7 @@ namespace size_t res = out.size(); std::copy(newDocuments.begin(), newDocuments.end(), back_inserter(out)); std::copy_if(oldDocuments.begin() + splitAt, oldDocuments.end(), back_inserter(out), [&uuids](document::document_ptr const& doc){ return uuids.find(doc->identifier()) == uuids.end(); }); - return res; + return out.empty() ? 0 : std::min(res, out.size()-1); } static std::vector make_vector (document::document_ptr const& document)