From e105bbd971a3f180cce936f3e81bf49d10ebfbe9 Mon Sep 17 00:00:00 2001 From: "SND\\weimingzhi_cp" Date: Mon, 28 Jun 2010 08:07:25 +0000 Subject: wrong change, revert git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@53736 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- ChangeLog | 5 ----- win32/gui/plugin.c | 8 ++++---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 66f8b04d..b4fc7b0b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,3 @@ -Jun 28, 2010 Wei Mingzhi - - * win32/gui/plugin.c: Close PAD plugin before GPU plugin, should fix crash - issue when using LilyPad. - Jun 26, 2010 Wei Mingzhi * libpcsxcore/psxbios.c: Fixed bcopy() (FF9 battle crash with HLE BIOS - my diff --git a/win32/gui/plugin.c b/win32/gui/plugin.c index f498e74e..cab6d36b 100644 --- a/win32/gui/plugin.c +++ b/win32/gui/plugin.c @@ -303,16 +303,16 @@ void ClosePlugins() { int ret; UpdateMenuSlots(); - ret = PAD1_close(); - if (ret < 0) { SysMessage (_("Error Closing PAD1 Plugin")); return; } - ret = PAD2_close(); - if (ret < 0) { SysMessage (_("Error Closing PAD2 Plugin")); return; } ret = CDR_close(); if (ret < 0) { SysMessage (_("Error Closing CDR Plugin")); return; } ret = GPU_close(); if (ret < 0) { SysMessage (_("Error Closing GPU Plugin")); return; } ret = SPU_close(); if (ret < 0) { SysMessage (_("Error Closing SPU Plugin")); return; } + ret = PAD1_close(); + if (ret < 0) { SysMessage (_("Error Closing PAD1 Plugin")); return; } + ret = PAD2_close(); + if (ret < 0) { SysMessage (_("Error Closing PAD2 Plugin")); return; } if (Config.UseNet) { NET_pause(); -- cgit v1.2.3