anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-27 03:36:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix crash on exit after a Buffer switch.

Browse Source 
Log:
* lyxfunc.C:
  - LyXFunc::dispatch(): put some save guards before using
    BufferView::cursor() and sendDispatchMessage().

* BufferView_pimpl.C
  - BufferView::Pimpl::setBuffer(): return before if exiting.

* WorkArea.C:
  - WorkArea::redraw(): update the toolbar when greying out.

* LyXView.C:
  - LyXView::setBuffer(): sanitization 


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14815 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Abdelrazak Younes 2006-08-23 08:27:51 +00:00
parent c46e1bdc9a
commit 83eb07fc4b
4 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/BufferView_pimpl.C
View File

@ -260,6 +260,12 @@ void BufferView::Pimpl::setBuffer(Buffer * b)
boost::tie(cursor_.pit(), cursor_.pos()) );
}
// If we're quitting lyx, don't bother updating stuff
if (quitting) {
buffer_ = 0;
return;
}
// If we are closing current buffer, switch to the first in
// buffer list.
if (!b) {
@ -277,10 +283,6 @@ void BufferView::Pimpl::setBuffer(Buffer * b)
anchor_ref_ = 0;
offset_ref_ = 0;
// If we're quitting lyx, don't bother updating stuff
if (quitting)
return;
if (buffer_) {
lyxerr[Debug::INFO] << BOOST_CURRENT_FUNCTION
<< "Buffer addr: " << buffer_ << endl;

9
src/frontends/LyXView.C
View File

@ -139,22 +139,19 @@ void LyXView::setBuffer(Buffer * b)
work_area_->bufferView().setBuffer(b);
if (work_area_->bufferView().buffer())
{
if (work_area_->bufferView().buffer()) {
// Buffer-dependent dialogs should be updated or
// hidden. This should go here because some dialogs (eg ToC)
// require bv_->text.
getDialogs().updateBufferDependent(true);
connectBuffer(*work_area_->bufferView().buffer());
setLayout(work_area_->bufferView().firstLayout());
}
updateMenubar();
updateToolbars();
updateLayoutChoice();
updateWindowTitle();
if (b) {
connectBuffer(*b);
setLayout(work_area_->bufferView().firstLayout());
}
redrawWorkArea();
}

1
src/frontends/WorkArea.C
View File

@ -192,6 +192,7 @@ void WorkArea::redraw()
if (!buffer_view_->buffer()) {
greyOut();
updateScrollbar();
return;
}

9
src/lyxfunc.C
View File

@ -1611,13 +1611,14 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
&& !lyxaction.funcHasFlag(cmd.action, LyXAction::NoBuffer)
&& !lyxaction.funcHasFlag(cmd.action, LyXAction::ReadOnly))
view()->buffer()->markDirty();
}
if (view()->cursor().inTexted()) {
view()->owner()->updateLayoutChoice();
if (view()->cursor().inTexted()) {
view()->owner()->updateLayoutChoice();
}
}
}
sendDispatchMessage(_(getMessage()), cmd);
if (!quitting)
sendDispatchMessage(_(getMessage()), cmd);
}