mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-10 04:57:00 -04:00
renamed SpellChecker::destroy to destroyAll, because the former conflicted with IntrusivePtrBase::destroy. The result was that destroy was called recursively and objects were freed multiple times.
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1264 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
@@ -8,6 +8,7 @@
|
||||
|
||||
#include <util/prec.hpp>
|
||||
#include <util/io/package_manager.hpp>
|
||||
#include <util/spell_checker.hpp>
|
||||
#include <data/game.hpp>
|
||||
#include <data/set.hpp>
|
||||
#include <data/settings.hpp>
|
||||
@@ -258,6 +259,7 @@ int MSE::OnExit() {
|
||||
thumbnail_thread.abortAll();
|
||||
settings.write();
|
||||
package_manager.destroy();
|
||||
SpellChecker::destroyAll();
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@ SpellChecker::SpellChecker(const char* aff_path, const char* dic_path)
|
||||
, encoding(String(get_dic_encoding(), IF_UNICODE(wxConvLibc, wxSTRING_MAXLEN)))
|
||||
{}
|
||||
|
||||
void SpellChecker::destroy() {
|
||||
void SpellChecker::destroyAll() {
|
||||
spellers.clear();
|
||||
}
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@ class SpellChecker : public Hunspell, public IntrusivePtrBase<SpellChecker> {
|
||||
/** Note: This is not threadsafe yet */
|
||||
static SpellChecker& get(const String& language);
|
||||
/// Destroy all cached SpellChecker objects
|
||||
static void destroy();
|
||||
static void destroyAll();
|
||||
|
||||
/// Check the spelling of a single word
|
||||
bool spell(const String& word);
|
||||
|
||||
Reference in New Issue
Block a user