mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-05-22 02:52:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

nJoy:

Browse source 
1. Circumvent the IDirectInputDevice2::SetDataFormat() error when opening the configuration window to.

2. Fixed the Allow out of focus input option again

3. Allow changing of the mapped pads while a game is running

4. Prevented crashes or problems from any combination of having the configuration window open when a game is started or stopped

5. Fixed a crash that would occur after nJoy was started with a connected pad, then stopped, and all pads disconnected, then started again

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2215 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
John Peterson 2009-02-11 10:30:02 +00:00
parent 5ba51ed789
commit 68f39cb287
18 changed files with 271 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp
View file

@ -159,10 +159,16 @@ void ConfigBox::OnKeyDown(wxKeyEvent& event)
// Close window
// ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
void ConfigBox::OnClose(wxCloseEvent& /*event*/)
void ConfigBox::OnClose(wxCloseEvent& event)
{
EndModal(0);
if(!g_EmulatorRunning) Shutdown(); // Close pads, unless we are running a game
// Allow wxWidgets to close the window
event.Skip();
// Stop the timer
m_ConstantTimer->Stop();
// Close pads, unless we are running a game
if(!g_EmulatorRunning) Shutdown();
}
// Call about dialog
@ -977,9 +983,9 @@ void ConfigBox::CreateGUIControls()
// Don't allow these changes when running
if(g_EmulatorRunning)
{
m_Joyname[i]->Enable(false);
//m_Joyname[i]->Enable(false);
m_Joyattach[i]->Enable(false);
m_ControlType[i]->Enable(false);
//m_ControlType[i]->Enable(false);
}
// Update GUI