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

Fix preview with a nested preview not being shown (#10795)

Browse Source 
Regression at db581113.

(cherry picked from commit 94c65074e0)
This commit is contained in:
Guillaume MM 2018-01-03 19:58:50 +01:00 committed by Scott Kostyshak
parent 6cdd0b9fe0
commit 225d47f298
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/graphics/PreviewLoader.cpp
View File

@ -239,7 +239,7 @@ private:
/// We don't own this /// We don't own this
static lyx::Converter const * pconverter_; static lyx::Converter const * pconverter_;
signals2::scoped_connection connection_; Trackable trackable_;
}; };
@ -738,10 +738,9 @@ void PreviewLoader::Impl::startLoading(bool wait)
// Initiate the conversion from LaTeX to bitmap images files. // Initiate the conversion from LaTeX to bitmap images files.
ForkedCall::sigPtr convert_ptr = make_shared<ForkedCall::sig>(); ForkedCall::sigPtr convert_ptr = make_shared<ForkedCall::sig>();
// This is a scoped connection convert_ptr->connect(ForkedProcess::slot([this](pid_t pid, int retval){
connection_ = convert_ptr->connect([this](pid_t pid, int retval){ finishedGenerating(pid, retval);
finishedGenerating(pid, retval); }).track_foreign(trackable_.p()));
});
ForkedCall call(buffer_.filePath()); ForkedCall call(buffer_.filePath());
int ret = call.startScript(command, convert_ptr); int ret = call.startScript(command, convert_ptr);