mirror of
https://git.lyx.org/repos/lyx.git
synced 2025-01-14 20:26:50 +00:00
- fix formatting (tab vs space)
- 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
This commit is contained in:
parent
18ae289343
commit
9b3d9eb602
@ -384,9 +384,6 @@ void LyX::prepareExit()
|
|||||||
lyx::from_utf8(package().temp_dir()));
|
lyx::from_utf8(package().temp_dir()));
|
||||||
Alert::warning(_("Unable to remove temporary directory"), msg);
|
Alert::warning(_("Unable to remove temporary directory"), msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
pimpl_->lyx_server_.reset();
|
|
||||||
pimpl_->lyx_socket_.reset();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -414,6 +411,8 @@ void LyX::quit(bool noask)
|
|||||||
prepareExit();
|
prepareExit();
|
||||||
|
|
||||||
if (lyx::use_gui) {
|
if (lyx::use_gui) {
|
||||||
|
pimpl_->lyx_server_.reset();
|
||||||
|
pimpl_->lyx_socket_.reset();
|
||||||
pimpl_->application_->exit(0);
|
pimpl_->application_->exit(0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -860,9 +859,9 @@ void LyX::emergencyCleanup() const
|
|||||||
pimpl_->buffer_list_.emergencyWriteAll();
|
pimpl_->buffer_list_.emergencyWriteAll();
|
||||||
if (lyx::use_gui) {
|
if (lyx::use_gui) {
|
||||||
pimpl_->lyx_server_->emergencyCleanup();
|
pimpl_->lyx_server_->emergencyCleanup();
|
||||||
pimpl_->lyx_server_.reset();
|
pimpl_->lyx_server_.reset();
|
||||||
pimpl_->lyx_socket_.reset();
|
pimpl_->lyx_socket_.reset();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user