Do not call CoInitialize unless native speller was used (#327)

Predelnik · Aug 20, 2023 · 9c89295 · 9c89295
1 parent 3d522d2
commit 9c89295
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 11 deletions.
diff --git a/src/spellers/SpellerContainer.cpp b/src/spellers/SpellerContainer.cpp
@@ -100,7 +100,6 @@ void SpellerContainer::add_to_dictionary(std::wstring wstr) {
 SpellerContainer::SpellerContainer(const Settings *settings, const NppData *npp_data)
   : m_settings(*settings) {
   init_spellers(*npp_data);
-  m_native_speller->init(); // just to allow checking if it's available or not
   m_settings.settings_changed.connect([this] { on_settings_changed(); });
 }
 

diff --git a/src/ui/SettingsDialog.cpp b/src/ui/SettingsDialog.cpp
@@ -814,15 +814,6 @@ void SimpleSettingsTab::update_controls(const Settings &settings, const SpellerC
   Button_SetCheck(m_h_select_misspelled_on_menu_cb, settings.data.select_word_on_context_menu_click);
 }
 
-void SimpleSettingsTab::init_speller_id_combobox(const SpellerContainer &speller_container) {
-  m_speller_cmb.clear();
-  for (auto id : enum_range<SpellerId>()) {
-    if (id == SpellerId::native && !speller_container.native_speller().is_working())
-      continue;
-    m_speller_cmb.add_item(id);
-  }
-}
-
 void SettingsDialog::update_rect_offset_due_to_buttons(RECT &rc) {
   auto ok_hwnd = GetDlgItem(_hSelf, IDOK);
   RECT ok_rect;
@@ -842,7 +833,6 @@ INT_PTR SettingsDialog::run_dlg_proc(UINT message, WPARAM w_param, LPARAM l_para
 
     m_simple_dlg.init_settings(_hInst, _hSelf);
     m_simple_dlg.create(IDD_SIMPLE, false, false);
-    m_simple_dlg.init_speller_id_combobox(m_speller_container);
     m_simple_dlg.display();
     m_advanced_dlg.init(_hInst, _hSelf);
     m_advanced_dlg.create(IDD_ADVANCED, false, false);