anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-03 08:28:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Initializing the gui_ member of the cloned buffer has strange side effects

Browse Source 
with Qt/X11 (obscure X errors). Better avoiding it.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37797 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Enrico Forestieri 2011-02-28 03:39:43 +00:00
parent 2969cb53e2
commit a079d95038
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Buffer.cpp
View File

@ -342,7 +342,6 @@ Buffer::Impl::Impl(Buffer * owner, FileName const & file, bool readonly_,
temppath = cloned_buffer_->d->temppath;
file_fully_loaded = true;
params = cloned_buffer_->d->params;
gui_ = cloned_buffer->d->gui_;
bibfiles_cache_ = cloned_buffer_->d->bibfiles_cache_;
bibinfo_ = cloned_buffer_->d->bibinfo_;
bibinfo_cache_valid_ = cloned_buffer_->d->bibinfo_cache_valid_;
@ -3558,7 +3557,6 @@ bool Buffer::doExport(string const & format, bool put_in_tempdir,
if (d->cloned_buffer_) {
d->cloned_buffer_->d->errorLists["Export"] =
d->errorLists["Export"];
errors("Export");
}
return false;
}
@ -3573,7 +3571,6 @@ bool Buffer::doExport(string const & format, bool put_in_tempdir,
if (d->cloned_buffer_) {
d->cloned_buffer_->d->errorLists["Export"] =
d->errorLists["Export"];
errors("Export");
}
return false;
}

5
src/frontends/qt4/GuiView.cpp
View File

@ -530,6 +530,11 @@ void GuiView::processingThreadFinished(bool show_errors)
message(watcher->result());
updateToolbars();
if (show_errors) {
BufferView const * const bv = currentBufferView();
if (bv && !bv->buffer().errorList("Export").empty()) {
errors("Export");
return;
}
errors(d.last_export_format);
}
}