commit ea6f56d564995beac0d5d3579e80cc7311415310 Author: Vincent van Ravesteijn <v...@lyx.org> Date: Fri Feb 7 14:06:39 2014 +0100
Compare: Add the authors from the 'other' document Otherwise the resulting document may contain references to authors that are not present in the author list, which results in a crash. Fixes-bug: #8769 diff --git a/src/Compare.cpp b/src/Compare.cpp index f5d1d54..6f77b52 100644 --- a/src/Compare.cpp +++ b/src/Compare.cpp @@ -12,6 +12,7 @@ #include "Compare.h" +#include "Author.h" #include "BufferParams.h" #include "Changes.h" #include "Font.h" @@ -364,10 +365,17 @@ void Compare::run() if (!dest_buffer || !new_buffer || !old_buffer) return; - // Copy the buffer params to the new buffer + // Copy the buffer params to the destination buffer dest_buffer->params() = options_.settings_from_new ? new_buffer->params() : old_buffer->params(); + // Copy extra authors to the destination buffer + AuthorList const & extra_authors = options_.settings_from_new ? + old_buffer->params().authors() : new_buffer->params().authors(); + AuthorList::Authors::const_iterator it = extra_authors.begin(); + for (; it != extra_authors.end(); it++) + dest_buffer->params().authors().record(*it); + doStatusMessage(); // do the real work