mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
Shutdown LyX server and socket before trying to remove the tempdir,
otherwise it would not be empty and could not be removed. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21992 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
5ae6e67a8b
commit
40dd6a1b08
17
src/LyX.cpp
17
src/LyX.cpp
@ -471,6 +471,15 @@ void LyX::prepareExit()
|
|||||||
// close buffers first
|
// close buffers first
|
||||||
pimpl_->buffer_list_.closeAll();
|
pimpl_->buffer_list_.closeAll();
|
||||||
|
|
||||||
|
// register session changes and shutdown server and socket
|
||||||
|
if (use_gui) {
|
||||||
|
if (pimpl_->session_)
|
||||||
|
pimpl_->session_->writeFile();
|
||||||
|
pimpl_->session_.reset();
|
||||||
|
pimpl_->lyx_server_.reset();
|
||||||
|
pimpl_->lyx_socket_.reset();
|
||||||
|
}
|
||||||
|
|
||||||
// do any other cleanup procedures now
|
// do any other cleanup procedures now
|
||||||
if (package().temp_dir() != package().system_temp_dir()) {
|
if (package().temp_dir() != package().system_temp_dir()) {
|
||||||
LYXERR(Debug::INFO, "Deleting tmp dir "
|
LYXERR(Debug::INFO, "Deleting tmp dir "
|
||||||
@ -484,14 +493,6 @@ void LyX::prepareExit()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (use_gui) {
|
|
||||||
if (pimpl_->session_)
|
|
||||||
pimpl_->session_->writeFile();
|
|
||||||
pimpl_->session_.reset();
|
|
||||||
pimpl_->lyx_server_.reset();
|
|
||||||
pimpl_->lyx_socket_.reset();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Kill the application object before exiting. This avoids crashes
|
// Kill the application object before exiting. This avoids crashes
|
||||||
// when exiting on Linux.
|
// when exiting on Linux.
|
||||||
if (pimpl_->application_)
|
if (pimpl_->application_)
|
||||||
|
Loading…
Reference in New Issue
Block a user