From 9e10486e2c103dd776d841c4bf577599d478fa81 Mon Sep 17 00:00:00 2001 From: zilmar Date: Mon, 16 Nov 2015 07:13:09 +1100 Subject: [PATCH] [Project64] Pass main window object to plugin config --- Source/Project64/Plugins/Controller Plugin.cpp | 2 +- Source/Project64/Plugins/Plugin Class.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Project64/Plugins/Controller Plugin.cpp b/Source/Project64/Plugins/Controller Plugin.cpp index 8ee06d59d..2567f39cd 100644 --- a/Source/Project64/Plugins/Controller Plugin.cpp +++ b/Source/Project64/Plugins/Controller Plugin.cpp @@ -104,7 +104,7 @@ bool CControl_Plugin::Initiate(CN64System * System, RenderWindow * Window) ControlInfo.Controls = m_PluginControllers; ControlInfo.HEADER = (System == NULL ? Buffer : g_Rom->GetRomAddress()); ControlInfo.hinst = GetModuleHandle(NULL); - ControlInfo.hMainWindow = (HWND)Window->GetWindowHandle(); + ControlInfo.hMainWindow = Window ? (HWND)Window->GetWindowHandle() : NULL; ControlInfo.MemoryBswaped = TRUE; InitiateControllers_1_1(&ControlInfo); diff --git a/Source/Project64/Plugins/Plugin Class.cpp b/Source/Project64/Plugins/Plugin Class.cpp index 042883bc4..90e54beb6 100644 --- a/Source/Project64/Plugins/Plugin Class.cpp +++ b/Source/Project64/Plugins/Plugin Class.cpp @@ -326,7 +326,7 @@ void CPlugins::ConfigPlugin(void* hParent, PLUGIN_TYPE Type) if (m_RSP == NULL || m_RSP->DllConfig == NULL) { break; } if (!m_RSP->Initialized()) { - if (!m_RSP->Initiate(NULL, NULL)) + if (!m_RSP->Initiate(this, NULL)) { break; } @@ -337,7 +337,7 @@ void CPlugins::ConfigPlugin(void* hParent, PLUGIN_TYPE Type) if (m_Gfx == NULL || m_Gfx->DllConfig == NULL) { break; } if (!m_Gfx->Initialized()) { - if (!m_Gfx->Initiate(NULL, NULL)) + if (!m_Gfx->Initiate(NULL, m_MainWindow)) { break; } @@ -348,7 +348,7 @@ void CPlugins::ConfigPlugin(void* hParent, PLUGIN_TYPE Type) if (m_Audio == NULL || m_Audio->DllConfig == NULL) { break; } if (!m_Audio->Initialized()) { - if (!m_Audio->Initiate(NULL, NULL)) + if (!m_Audio->Initiate(NULL, m_MainWindow)) { break; } @@ -359,7 +359,7 @@ void CPlugins::ConfigPlugin(void* hParent, PLUGIN_TYPE Type) if (m_Control == NULL || m_Control->DllConfig == NULL) { break; } if (!m_Control->Initialized()) { - if (!m_Control->Initiate(NULL, NULL)) + if (!m_Control->Initiate(NULL, m_MainWindow)) { break; }