X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyX.cpp;h=0c8234d9618e177f01abe99879e453fa15183fe7;hb=021f51e19b3751f8f15d8bd89f7aa6a109624b29;hp=f09edcdda24f483cb56469e4fb9ea4c88d5f4cce;hpb=21daab357bcff2bf26d63cb59df69f6afa2acf3f;p=lyx.git

diff --git a/src/LyX.cpp b/src/LyX.cpp
index f09edcdda2..0c8234d961 100644
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -132,7 +132,8 @@ struct LyX::Impl
 
 	~Impl()
 	{
-		delete spell_checker_;
+		delete aspell_checker_;
+		delete hunspell_checker_;
 	}
 
 	/// our function handler
@@ -226,7 +227,6 @@ LyX::LyX()
 {
 	singleton_ = this;
 	pimpl_ = new Impl;
-	setSpellChecker();
 }
 
 
@@ -750,7 +750,7 @@ bool LyX::init()
 	if (!LyXSetStyle())
 		return false;
 	//...and the modules
-	moduleList.read();
+	theModuleList.read();
 
 	// read keymap and ui files in batch mode as well
 	// because InsetInfo needs to know these to produce
@@ -765,8 +765,6 @@ bool LyX::init()
 	// load user bind file user.bind
 	pimpl_->toplevel_keymap_.read("user", 0, KeyMap::MissingOK);
 
-	pimpl_->lyxfunc_.initKeySequences(&pimpl_->toplevel_keymap_);
-
 	if (lyxerr.debugging(Debug::LYXRC))
 		lyxrc.print();
 
@@ -1274,6 +1272,8 @@ CmdDef & theTopLevelCmdDef()
 
 SpellChecker * theSpellChecker()
 {
+	if (!singleton_->pimpl_->spell_checker_)
+		setSpellChecker();
 	return singleton_->pimpl_->spell_checker_;
 }