X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FServer.cpp;h=98e1d6632c9bd688c2fc7e7c94a5d2d76995ed31;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=1e673e6f8708e9fa1701b74dc0572dcc0d271c42;hpb=ea3154184833f4f2426eb2a956878e83ddd822d9;p=lyx.git

diff --git a/src/Server.cpp b/src/Server.cpp
index 1e673e6f87..98e1d6632c 100644
--- a/src/Server.cpp
+++ b/src/Server.cpp
@@ -55,8 +55,9 @@
 #include "support/lassert.h"
 #include "support/lstrings.h"
 #include "support/os.h"
+#include "support/signals.h"
 
-#include "support/bind.h"
+#include <iostream>
 
 #ifdef _WIN32
 #include <io.h>
@@ -136,7 +137,7 @@ DWORD WINAPI pipeServerWrapper(void * arg)
 
 
 LyXComm::LyXComm(string const & pip, Server * cli, ClientCallbackfct ccb)
-	: pipename_(pip), client_(cli), clientcb_(ccb), stopserver_(0)
+	: stopserver_(0), pipename_(pip), client_(cli), clientcb_(ccb)
 {
 	for (int i = 0; i < MAX_PIPES; ++i) {
 		event_[i] = 0;
@@ -209,7 +210,7 @@ bool LyXComm::pipeServer()
 
 		// Determine which pipe instance completed the operation.
 		i = wait - WAIT_OBJECT_0;
-		LASSERT(i >= 0 && i <= MAX_PIPES, /**/);
+		LASSERT(i <= MAX_PIPES, /**/);
 
 		// Check whether we were waked up for stopping the pipe server.
 		if (i == MAX_PIPES)
@@ -695,6 +696,7 @@ string const LyXComm::pipeName(DWORD index) const
 LyXComm::LyXComm(string const &, Server *, ClientCallbackfct)
 {}
 
+
 void LyXComm::openConnection()
 {}
 
@@ -716,6 +718,7 @@ void LyXComm::endPipe(int & fd, string const & filename, bool write)
 void LyXComm::emergencyCleanup()
 {}
 
+
 void LyXComm::read_ready()
 {}
 
@@ -726,7 +729,6 @@ 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)
 {
@@ -856,8 +858,12 @@ int LyXComm::startPipe(string const & file, bool write)
 	}
 
 	if (!write) {
-		theApp()->registerSocketCallback(fd,
-			bind(&LyXComm::read_ready, this));
+		// Make sure not to call read_ready after destruction.
+		weak_ptr<void> tracker = tracker_.p();
+		theApp()->registerSocketCallback(fd, [=](){
+				if (!tracker.expired())
+					read_ready();
+			});
 	}
 
 	return fd;
@@ -877,7 +883,7 @@ void LyXComm::endPipe(int & fd, string const & filename, bool write)
 		       << '\n' << strerror(errno) << endl;
 	}
 
-	if (FileName(filename).removeFile() < 0) {
+	if (!FileName(filename).removeFile()) {
 		lyxerr << "LyXComm: Could not remove pipe " << filename
 		       << '\n' << strerror(errno) << endl;
 	}
@@ -915,7 +921,6 @@ void LyXComm::read_ready()
 	int status;
 	// the single = is intended here.
 	while ((status = ::read(infd_, charbuf, charbuf_size - 1))) {
-
 		if (status > 0) {
 			charbuf[status] = '\0'; // turn it into a c string
 			read_buffer_ += rtrim(charbuf, "\r");
@@ -966,7 +971,8 @@ void LyXComm::send(string const & msg)
 
 	LYXERR(Debug::LYXSERVER, "LyXComm: Sending '" << msg << '\'');
 
-	if (pipename_.empty()) return;
+	if (pipename_.empty())
+		return;
 
 	if (!ready_) {
 		LYXERR0("LyXComm: Pipes are closed. Could not send " << msg);
@@ -1068,7 +1074,6 @@ Server::~Server()
 
 int compare(char const * a, char const * b, unsigned int len)
 {
-	using namespace std;
 	return strncmp(a, b, len);
 }
 
@@ -1173,7 +1178,7 @@ void Server::callback(string const & msg)
 			// connect to the lyxfunc in the single GuiView we
 			// support currently. (Lgb)
 
-			FuncRequest fr(lyxaction.lookupFunc(cmd), arg);
+			FuncRequest fr(lyxaction.lookupFunc(cmd), from_ascii(arg));
 			fr.setOrigin(FuncRequest::LYXSERVER);
 			DispatchResult dr;
 			theApp()->dispatch(fr, dr);