summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
18ae289)
- Move lyx_server_ and lyx_socket destruction out of prepareExit() because those are only available when lyx::use_gui is true.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15394
a592a061-630c-0410-9148-
cb99ea01b6c8
lyx::from_utf8(package().temp_dir()));
Alert::warning(_("Unable to remove temporary directory"), msg);
}
lyx::from_utf8(package().temp_dir()));
Alert::warning(_("Unable to remove temporary directory"), msg);
}
-
- pimpl_->lyx_server_.reset();
- pimpl_->lyx_socket_.reset();
prepareExit();
if (lyx::use_gui) {
prepareExit();
if (lyx::use_gui) {
+ pimpl_->lyx_server_.reset();
+ pimpl_->lyx_socket_.reset();
pimpl_->application_->exit(0);
}
}
pimpl_->application_->exit(0);
}
}
pimpl_->buffer_list_.emergencyWriteAll();
if (lyx::use_gui) {
pimpl_->lyx_server_->emergencyCleanup();
pimpl_->buffer_list_.emergencyWriteAll();
if (lyx::use_gui) {
pimpl_->lyx_server_->emergencyCleanup();
- pimpl_->lyx_server_.reset();
- pimpl_->lyx_socket_.reset();
- }
+ pimpl_->lyx_server_.reset();
+ pimpl_->lyx_socket_.reset();
+ }