From: Abdelrazak Younes <younes@lyx.org>
Date: Fri, 20 Oct 2006 09:56:28 +0000 (+0000)
Subject: - fix formatting (tab vs space)
X-Git-Tag: 1.6.10~12327
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=9b3d9eb602ebd91c3e607729b970cfb09a63be66;hp=18ae289343da96e5394ca9cd21cc8abd1c4bfcd6;p=lyx.git

- 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
---

diff --git a/src/lyx_main.C b/src/lyx_main.C
index 960ef9528d..5136397639 100644
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -384,9 +384,6 @@ void LyX::prepareExit()
 			lyx::from_utf8(package().temp_dir()));
 		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();
 
 	if (lyx::use_gui) {
+		pimpl_->lyx_server_.reset();
+		pimpl_->lyx_socket_.reset();
 		pimpl_->application_->exit(0);
 	}
 }
@@ -860,9 +859,9 @@ void LyX::emergencyCleanup() const
 	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();
+	}
 }