There are two more locations in messages.C where this should be fixed.
Fixed. (14785)
The next problem is a crash when LyX 1.4 is closed, in lyxsocket.C line 79.
Fixed (14786), with the following code copied from trunk.
Index: src/lyxsocket.C
===================================================================
--- src/lyxsocket.C (revision 14784)
+++ src/lyxsocket.C (working copy)
@@ -74,8 +74,12 @@
// Close the socket and remove the address of the filesystem.
LyXServerSocket::~LyXServerSocket()
{
- lyx_gui::unregister_socket_callback(fd_);
- ::close(fd_);
+ if (fd_ != -1) {
+ lyx_gui::unregister_socket_callback(fd_);
+ if (::close(fd_) != 0)
+ lyxerr << "lyx: Server socket " << fd_
+ << " IO error on closing: " << strerror(errno);
+ }
lyx::support::unlink(address_);
lyxerr[Debug::LYXSERVER] << "lyx: Server socket quitting" << endl;
}
JMarc, sorry that I did not wait for your approval for 14786. I am in
a hurry and the patch is obvious enough.
Bo
