Merge pull request #7207 from spycrab/qt_lazy_hotkey

Qt/MainWindow: Lazily initialize hotkey mapping window
dolphin-emu · Jul 3, 2018 · 806c1ee · 806c1ee
2 parents f8bb435 + 457d7cf
commit 806c1ee
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/Source/Core/DolphinQt2/MainWindow.cpp b/Source/Core/DolphinQt2/MainWindow.cpp
@@ -258,8 +258,6 @@ void MainWindow::CreateComponents()
     m_wii_tas_input_windows[controller_id]->GetValues(input_data, rptf, ext, key);
   });
 
-  m_hotkey_window = new MappingWindow(this, MappingWindow::Type::MAPPING_HOTKEYS, 0);
-
   m_jit_widget = new JITWidget(this);
   m_log_widget = new LogWidget(this);
   m_log_config_widget = new LogConfigWidget(this);
@@ -304,7 +302,6 @@ void MainWindow::CreateComponents()
   m_graphics_window = new GraphicsWindow(nullptr, this);
 #endif
 
-  InstallHotkeyFilter(m_hotkey_window);
   InstallHotkeyFilter(m_controllers_window);
   InstallHotkeyFilter(m_settings_window);
   InstallHotkeyFilter(m_graphics_window);
@@ -928,9 +925,13 @@ void MainWindow::ShowAboutDialog()
 
 void MainWindow::ShowHotkeyDialog()
 {
-  m_hotkey_window->show();
-  m_hotkey_window->raise();
-  m_hotkey_window->activateWindow();
+  auto* hotkey_window = new MappingWindow(this, MappingWindow::Type::MAPPING_HOTKEYS, 0);
+
+  InstallHotkeyFilter(hotkey_window);
+
+  hotkey_window->show();
+  hotkey_window->raise();
+  hotkey_window->activateWindow();
 }
 
 void MainWindow::ShowGraphicsWindow()

diff --git a/Source/Core/DolphinQt2/MainWindow.h b/Source/Core/DolphinQt2/MainWindow.h
@@ -33,7 +33,6 @@ class HotkeyScheduler;
 class JITWidget;
 class LogConfigWidget;
 class LogWidget;
-class MappingWindow;
 class MemoryWidget;
 class NetPlayClient;
 class NetPlayDialog;
@@ -182,7 +181,6 @@ class MainWindow final : public QMainWindow
   HotkeyScheduler* m_hotkey_scheduler;
   ControllersWindow* m_controllers_window;
   SettingsWindow* m_settings_window;
-  MappingWindow* m_hotkey_window;
   NetPlayDialog* m_netplay_dialog;
   NetPlaySetupDialog* m_netplay_setup_dialog;
   GraphicsWindow* m_graphics_window;