diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-07-09 09:33:55 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-07-09 09:33:55 +0000 |
| commit | c6c9d266fad98310bb6f0118362d8dc7e60ecfae (patch) | |
| tree | df4f355d09afe3c1deb2a839d56dd1095e073209 /macosx/PluginList.m | |
| parent | a2e6c179be60efa937f1f51a45c53919bb44083d (diff) | |
| download | pcsxr-c6c9d266fad98310bb6f0118362d8dc7e60ecfae.tar.gz | |
Make the bladesio1 driver work on OS X:
Fix a bug where the wrong plug-in was being used in place of sio1, causing PCSXR to complain.
Fix a bug where bladesio1's config window would cause PCSXR to crash.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85936 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/PluginList.m')
| -rwxr-xr-x | macosx/PluginList.m | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/macosx/PluginList.m b/macosx/PluginList.m index 621e7f3c..cd15da58 100755 --- a/macosx/PluginList.m +++ b/macosx/PluginList.m @@ -36,7 +36,7 @@ const static int typeList[] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD, P NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; pluginList = [[NSMutableArray alloc] initWithCapacity:20]; - activeGpuPlugin = activeSpuPlugin = activeCdrPlugin = activePadPlugin = activeNetPlugin = nil; + activeGpuPlugin = activeSpuPlugin = activeCdrPlugin = activePadPlugin = activeNetPlugin = activeSIO1Plugin = nil; missingPlugins = NO; for (i = 0; i < sizeof(typeList) / sizeof(typeList[0]); i++) { @@ -200,7 +200,7 @@ const static int typeList[] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD, P case PSE_LT_SPU: return activeSpuPlugin; break; case PSE_LT_PAD: return activePadPlugin; break; case PSE_LT_NET: return activeNetPlugin; break; - case PSE_LT_SIO1: return activeNetPlugin; break; + case PSE_LT_SIO1: return activeSIO1Plugin; break; } return nil; |