X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FServer.cpp;h=f545bb503820dba761ef97212686f58e8e8776b5;hb=4f341fc59dc755bbf5564567acd682ad9502410d;hp=98e1d6632c9bd688c2fc7e7c94a5d2d76995ed31;hpb=db58111360d68f76c5797069a7b80967447d1379;p=lyx.git diff --git a/src/Server.cpp b/src/Server.cpp index 98e1d6632c..f545bb5038 100644 --- a/src/Server.cpp +++ b/src/Server.cpp @@ -117,7 +117,7 @@ string errormsg(DWORD const error) return message; } -} // namespace anon +} // namespace DWORD WINAPI pipeServerWrapper(void * arg) @@ -137,14 +137,14 @@ DWORD WINAPI pipeServerWrapper(void * arg) LyXComm::LyXComm(string const & pip, Server * cli, ClientCallbackfct ccb) - : stopserver_(0), pipename_(pip), client_(cli), clientcb_(ccb) + : stopserver_(0), + ready_(false), pipename_(pip), client_(cli), clientcb_(ccb), + deferred_loading_(false) { for (int i = 0; i < MAX_PIPES; ++i) { event_[i] = 0; pipe_[i].handle = INVALID_HANDLE_VALUE; } - ready_ = false; - deferred_loading_ = false; openConnection(); } @@ -730,10 +730,10 @@ void LyXComm::send(string const & msg) #else // defined (HAVE_MKFIFO) LyXComm::LyXComm(string const & pip, Server * cli, ClientCallbackfct ccb) - : pipename_(pip), client_(cli), clientcb_(ccb) + : infd_(-1), outfd_(-1), + ready_(false), pipename_(pip), client_(cli), clientcb_(ccb), + deferred_loading_(false) { - ready_ = false; - deferred_loading_ = false; openConnection(); } @@ -997,7 +997,7 @@ struct Sleep : QThread } }; -} // namespace anon +} // namespace bool LyXComm::loadFilesInOtherInstance()