Merge pull request #14820 from SuperSamus/symbol-search-fix

Debugger: Fix symbol search speed

2 files changed, 5 insertions, 3 deletions

diff --git a/Source/Core/DolphinQt/Debugger/CodeWidget.cpp b/Source/Core/DolphinQt/Debugger/CodeWidget.cpp
index edac7e52b9..559b540451 100644
--- a/Source/Core/DolphinQt/Debugger/CodeWidget.cpp
+++ b/Source/Core/DolphinQt/Debugger/CodeWidget.cpp
@@ -41,7 +41,8 @@ static const QString BOX_SPLITTER_STYLESHEET = QStringLiteral(
 
 CodeWidget::CodeWidget(QWidget* parent)
     : QDockWidget(parent), m_system(Core::System::GetInstance()),
-      m_ppc_symbol_db(m_system.GetPPCSymbolDB())
+      m_ppc_symbol_db(m_system.GetPPCSymbolDB()),
+      m_show_demangled_names(Settings::Instance().IsShowDemangledNames())
 {
   setWindowTitle(tr("Code"));
   setObjectName(QStringLiteral("code"));
@@ -253,6 +254,7 @@ void CodeWidget::OnSetCodeAddress(u32 address)
 
 void CodeWidget::OnShowDemangledNamesChanged()
 {
+  m_show_demangled_names = Settings::Instance().IsShowDemangledNames();
   UpdateSymbols();
   if (const Common::Symbol* symbol = m_ppc_symbol_db.GetSymbolFromAddr(m_code_view->GetAddress()))
   {
@@ -565,8 +567,7 @@ void CodeWidget::UpdateFunctionCallers(const Common::Symbol* symbol)
 // demangled names.
 const std::string& CodeWidget::GetSymbolDisplayName(const Common::Symbol* symbol) const
 {
-  const bool show_demangled_names = Settings::Instance().IsShowDemangledNames();
-  return symbol->GetDisplayName(show_demangled_names);
+  return symbol->GetDisplayName(m_show_demangled_names);
 }
 
 void CodeWidget::Step()
diff --git a/Source/Core/DolphinQt/Debugger/CodeWidget.h b/Source/Core/DolphinQt/Debugger/CodeWidget.h
index 9a678e1c2c..89b6f8ea93 100644
--- a/Source/Core/DolphinQt/Debugger/CodeWidget.h
+++ b/Source/Core/DolphinQt/Debugger/CodeWidget.h
@@ -81,6 +81,7 @@ private:
 
   Core::System& m_system;
   PPCSymbolDB& m_ppc_symbol_db;
+  bool m_show_demangled_names;
 
   BranchWatchDialog* m_branch_watch_dialog = nullptr;
   QLineEdit* m_search_address;