From 2d09fff3746189929eddc592e2949861b84dac2c Mon Sep 17 00:00:00 2001 From: Enrico Forestieri Date: Sun, 30 Aug 2009 15:31:22 +0000 Subject: [PATCH] Quit notification from Qt is not needed anymore. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31240 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/Server.cpp | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/Server.cpp b/src/Server.cpp index 4c92c89cbf..2bcd85ccc3 100644 --- a/src/Server.cpp +++ b/src/Server.cpp @@ -93,14 +93,6 @@ private: namespace { -bool closing_ = false; - -void closing() -{ - closing_ = true; -} - - char * errormsg() { void * msgbuf; @@ -130,8 +122,6 @@ DWORD WINAPI pipeServerWrapper(void * arg) LyXComm::LyXComm(string const & pip, Server * cli, ClientCallbackfct ccb) : pipename_(pip), client_(cli), clientcb_(ccb), stopserver_(0) { - // Ask Qt to notify us on quit. - qAddPostRoutine(closing); ready_ = false; openConnection(); } @@ -379,7 +369,7 @@ bool LyXComm::event(QEvent * e) BOOL LyXComm::checkStopServer() { - return WaitForSingleObject(stopserver_, 0) == WAIT_OBJECT_0 || closing_; + return WaitForSingleObject(stopserver_, 0) == WAIT_OBJECT_0; } @@ -508,7 +498,7 @@ void LyXComm::closeConnection() } if (!ready_) { - LYXERR0("LyXComm: Already disconnected"); + LYXERR(Debug::LYXSERVER, "LyXComm: Already disconnected"); return; }