2 files changed, 3 insertions, 7 deletions
diff --git a/SwifTools/HunspellChecker.cpp b/SwifTools/HunspellChecker.cpp
index ecd352e..e9bc558 100644
--- a/SwifTools/HunspellChecker.cpp
+++ b/SwifTools/HunspellChecker.cpp
@@ -20,19 +20,19 @@ HunspellChecker::HunspellChecker(const char* affix_path, const char* dictionary_
 HunspellChecker::~HunspellChecker() {
 	delete speller_;
 }
 
 bool HunspellChecker::isCorrect(const std::string& word) {
 	return speller_->spell(word.c_str());
 }
 
 void HunspellChecker::getSuggestions(const std::string& word, std::vector<std::string>& list) {
-	char **suggestList;
+	char **suggestList = NULL;
 	int words_returned;
 	if (!word.empty()) {
 		words_returned = speller_->suggest(&suggestList, word.c_str());
 	}
 	for (int i = 0; i < words_returned; ++i) {
 		list.push_back(suggestList[i]);
 		free(suggestList[i]);
 	}
 	free(suggestList);
diff --git a/Swift/QtUI/QtTextEdit.cpp b/Swift/QtUI/QtTextEdit.cpp
index cac8bb4..8551f3d 100644
--- a/Swift/QtUI/QtTextEdit.cpp
+++ b/Swift/QtUI/QtTextEdit.cpp
@@ -196,28 +196,24 @@ void QtTextEdit::addSuggestions(QMenu* menu, QContextMenuEvent* event)
 		}
 	}
 	menu->insertAction(insertPoint, menu->addSeparator());
 }
 
 
 #ifdef HAVE_SPELLCHECKER
 void QtTextEdit::setUpSpellChecker()
 {
-	SpellCheckerFactory* checkerFactory = new SpellCheckerFactory();
 	delete checker_;
+	checker_ = NULL;
 	if (settings_->getSetting(SettingConstants::SPELL_CHECKER)) {
 		std::string dictPath = settings_->getSetting(SettingConstants::DICT_PATH);
 		std::string dictFile = settings_->getSetting(SettingConstants::DICT_FILE);
-		checker_ = checkerFactory->createSpellChecker(dictPath + dictFile);
-		delete checkerFactory;
-	}
-	else {
-		checker_ = NULL;
+		checker_ = SpellCheckerFactory().createSpellChecker(dictPath + dictFile);
 	}
 }
 #endif
 
 void QtTextEdit::spellCheckerSettingsWindow() {
 	if (!spellCheckerWindow_) {
 		spellCheckerWindow_ = new QtSpellCheckerWindow(settings_);
 		settings_->onSettingChanged.connect(boost::bind(&QtTextEdit::handleSettingChanged, this, _1));
 		spellCheckerWindow_->show();