ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Modal dialogs must be closed with EndModal() or all kinds of weird 

corruption can happen with wx 2.9.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7092 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2011-02-06 15:02:26 +00:00
parent 145559424c
commit d93dc23e77
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp
View File

@ -1,4 +1,3 @@
#include "VideoConfigDiag.h" #include "VideoConfigDiag.h"
#include "FileUtil.h" #include "FileUtil.h"
@ -51,7 +50,7 @@ void SettingChoice::UpdateValue(wxCommandEvent& ev)
void VideoConfigDiag::Event_ClickClose(wxCommandEvent&) void VideoConfigDiag::Event_ClickClose(wxCommandEvent&)
{ {
Close(); EndModal(wxID_OK);
} }
void VideoConfigDiag::Event_Close(wxCloseEvent& ev) void VideoConfigDiag::Event_Close(wxCloseEvent& ev)

2
Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
View File

@ -93,7 +93,7 @@ bool SaveTexture(const char* filename, u32 textarget, u32 tex, int width, int he
TextureCache::TCacheEntry::~TCacheEntry() TextureCache::TCacheEntry::~TCacheEntry()
{ {
if (texture) if (texture)
{ {
glDeleteTextures(1, &texture); glDeleteTextures(1, &texture);
texture = 0; texture = 0;

6
Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h
View File

@ -36,8 +36,8 @@ public:
private: private:
struct TCacheEntry : TCacheEntryBase struct TCacheEntry : TCacheEntryBase
{ {
GLuint texture; GLuint texture;
PC_TexFormat pcfmt; PC_TexFormat pcfmt;
@ -65,7 +65,7 @@ private:
private: private:
void SetTextureParameters(const TexMode0 &newmode, const TexMode1 &newmode1); void SetTextureParameters(const TexMode0 &newmode, const TexMode1 &newmode1);
}; };
~TextureCache(); ~TextureCache();

2
Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp
View File

@ -132,7 +132,7 @@ VideoConfigDialog::VideoConfigDialog(wxWindow* parent, const std::string& title,
void VideoConfigDialog::Event_ClickClose(wxCommandEvent&) void VideoConfigDialog::Event_ClickClose(wxCommandEvent&)
{ {
Close(); EndModal(wxID_OK);
} }
void VideoConfigDialog::Event_Close(wxCloseEvent& ev) void VideoConfigDialog::Event_Close(wxCloseEvent& ev)