Fix issue 1549, issue 1400, a crash when pressing reset while no game were running and better fix for issue 1556

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4451 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
sl1nk3.s
2009-10-22 19:13:22 +00:00
parent 5fb95d0443
commit 833341696b
8 changed files with 85 additions and 78 deletions

View File

@ -103,7 +103,7 @@ class GFXConfigDialogOGL : public wxDialog
wxCheckBox *m_NativeResolution, *m_2xResolution;
wxCheckBox *m_WidescreenHack;
wxCheckBox *m_ForceFiltering;
wxCheckBox *m_KeepAR43, *m_KeepAR169, *m_Crop;
wxCheckBox *m_Crop;
wxCheckBox *m_UseXFB;
wxCheckBox *m_AutoScale;
#ifndef _WIN32
@ -116,7 +116,7 @@ class GFXConfigDialogOGL : public wxDialog
wxChoice *m_MaxAnisotropyCB;
wxArrayString arrayStringFor_MSAAModeCB, arrayStringFor_PhackvalueCB;
wxArrayString arrayStringFor_PostShaderCB;
wxChoice *m_MSAAModeCB, *m_PhackvalueCB, *m_PostShaderCB;
wxChoice *m_MSAAModeCB, *m_PhackvalueCB, *m_PostShaderCB, *m_KeepAR;
wxCheckBox *m_ShowFPS;
wxCheckBox *m_ShaderErrors;
@ -138,7 +138,7 @@ class GFXConfigDialogOGL : public wxDialog
wxStaticBox * m_StaticBox_EFB;
wxCheckBox *m_CheckBox_DisableCopyEFB;
wxRadioButton *m_Radio_CopyEFBToRAM, *m_Radio_CopyEFBToGL;
wxCheckBox *m_EFBCopyDisableHotKey;
wxCheckBox *m_OSDHotKey;
wxCheckBox *m_Hack;
wxCheckBox *m_SafeTextureCache;
// Screen size
@ -159,8 +159,7 @@ class GFXConfigDialogOGL : public wxDialog
ID_VSYNC,
ID_RENDERTOMAINWINDOW,
ID_NATIVERESOLUTION, ID_2X_RESOLUTION,
ID_WIDESCREEN_HACK,
ID_KEEPAR_4_3, ID_KEEPAR_16_9, ID_CROP,
ID_KEEPAR, ID_CROP,
ID_USEXFB,
ID_AUTOSCALE,
@ -205,7 +204,7 @@ class GFXConfigDialogOGL : public wxDialog
ID_TEXTUREPATH,
ID_CHECKBOX_DISABLECOPYEFB,
ID_EFBCOPYDISABLEHOTKEY,
ID_OSDHOTKEY,
//ID_PROJECTIONHACK1,
ID_DSTALPHAPASS,
ID_RADIO_COPYEFBTORAM,