check if theApp is valid

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15973 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/lyx_main.C b/src/lyx_main.C
index aab365784227cdb7de034661181b7bdbde76b7d9..02263f2d804bb88d66e7ed121b120cf990fd9a5e 100644 (file)
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -417,6 +417,7 @@ void LyX::quit()
                pimpl_->lyx_server_.reset();
                pimpl_->lyx_socket_.reset();
                pimpl_->application_->exit(0);
+               theApp = 0;
        }
 }
 

diff --git a/src/lyxsocket.C b/src/lyxsocket.C
index 0de947676401945c424931c139dfea79178b6e3b..086a00e69df73d3c7356c9d0fbe42c148ad724a3 100644 (file)
--- a/src/lyxsocket.C
+++ b/src/lyxsocket.C
@@ -77,6 +77,7 @@ LyXServerSocket::LyXServerSocket(LyXFunc * f, string const & addr)
 LyXServerSocket::~LyXServerSocket()
 {
        if (fd_ != -1) {
+               BOOST_ASSERT (theApp);
                theApp->unregisterSocketCallback(fd_);
                if (::close(fd_) != 0)
                        lyxerr << "lyx: Server socket " << fd_