Move all python shebangs from /usr/bin/env to python3.

[lyx.git] / src / Server.cpp

diff --git a/src/Server.cpp b/src/Server.cpp
index a83911dc6910cd7eec2172006335dfb4cbd4cd38..d4a2120b6ea5e3c0550b5348a59766971259898a 100644 (file)
--- a/src/Server.cpp
+++ b/src/Server.cpp
@@ -356,7 +356,7 @@ bool LyXComm::pipeServer()
 
                        error = GetLastError();
 
-                       if (success && error == ERROR_IO_PENDING) {
+                       if (success && (error == ERROR_IO_PENDING || error == NO_ERROR)) {
                                // The write operation is still pending.
                                // We get here when a reader is started
                                // well before a reply is ready, so delay
@@ -1178,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), from_ascii(arg));
+                       FuncRequest fr(lyxaction.lookupFunc(cmd), from_utf8(arg));
                        fr.setOrigin(FuncRequest::LYXSERVER);
                        DispatchResult dr;
                        theApp()->dispatch(fr, dr);