The logic of the endParagraph() routine is wrong. We should first

[lyx.git] / src / LyX.cpp

diff --git a/src/LyX.cpp b/src/LyX.cpp
index 8db6eefe78acb0344c1184691e86f35bcb7c8943..7e56d550eefbc42f1ae6e2ce825c149d075d9b55 100644 (file)
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -44,6 +44,7 @@
 #include "Server.h"
 #include "ServerSocket.h"
 #include "Session.h"
+#include "WordList.h"
 
 #include "frontends/alert.h"
 #include "frontends/Application.h"
@@ -217,6 +218,7 @@ LyX::~LyX()
 {
        delete pimpl_;
        singleton_ = 0;
+       WordList::cleanupWordLists();
 }
 
 
@@ -446,8 +448,7 @@ void LyX::prepareExit()
 
        // Kill the application object before exiting. This avoids crashes
        // when exiting on Linux.
-       if (pimpl_->application_)
-               pimpl_->application_.reset();
+       pimpl_->application_.reset();
 }