Revert "Makes caret height adapt to context in mathed."

[lyx.git] / src / Server.cpp

diff --git a/src/Server.cpp b/src/Server.cpp
index f545bb503820dba761ef97212686f58e8e8776b5..5f5d873f54d79e95d3534b4329bd931bf3fddd1f 100644 (file)
--- a/src/Server.cpp
+++ b/src/Server.cpp
@@ -199,8 +199,8 @@ bool LyXComm::pipeServer()
        LYXERR(Debug::LYXSERVER, "LyXComm: Connection established");
        ready_ = true;
        outbuf_.erase();
-       DWORD status;
-       bool success;
+       DWORD status = 0;
+       bool success = false;
 
        while (!checkStopServer()) {
                // Indefinitely wait for the completion of an overlapped
@@ -1067,7 +1067,10 @@ Server::~Server()
        string message;
        for (int i = 0; i != numclients_; ++i) {
                message = "LYXSRV:" + clients_[i] + ":bye\n";
-               pipes_.send(message);
+               // ignore exceptions, we are quitting anyway
+               try {
+                       pipes_.send(message);
+               } catch (...) {}
        }
 }
 
@@ -1162,7 +1165,7 @@ void Server::callback(string const & msg)
                                                << client << " said goodbye");
                                } else {
                                        LYXERR(Debug::LYXSERVER,
-                                               "Server: ignoring bye messge from unregistered client" << client);
+                                               "Server: ignoring bye message from unregistered client" << client);
                                }
                        } else {
                                LYXERR0("Server: Undefined server command " << cmd << '.');