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

Merge pull request #610 from lioncash/delete 

DolphinWX: Remove the need for an explicit new/delete in ISOProperties
This commit is contained in:
Pierre Bourdon 2014-07-14 01:55:11 +02:00
parent 4d02675a8a 5b649902dc
commit 5c701f6e82
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/DolphinWX/ISOProperties.cpp
View File

@ -971,8 +971,7 @@ void CISOProperties::CheckPartitionIntegrity(wxCommandEvent& event)
int PartitionNum = wxAtoi(PartitionName.Mid(PartitionName.find_first_of("0123456789"), 1)); int PartitionNum = wxAtoi(PartitionName.Mid(PartitionName.find_first_of("0123456789"), 1));
const WiiPartition& Partition = WiiDisc[PartitionNum]; const WiiPartition& Partition = WiiDisc[PartitionNum];
wxProgressDialog* dialog = new wxProgressDialog( wxProgressDialog dialog(_("Checking integrity..."), _("Working..."), 1000, this,
_("Checking integrity..."), _("Working..."), 1000, this,
wxPD_APP_MODAL | wxPD_ELAPSED_TIME | wxPD_SMOOTH wxPD_APP_MODAL | wxPD_ELAPSED_TIME | wxPD_SMOOTH
); );
@ -981,11 +980,11 @@ void CISOProperties::CheckPartitionIntegrity(wxCommandEvent& event)
while (thread.IsAlive()) while (thread.IsAlive())
{ {
dialog->Pulse(); dialog.Pulse();
wxThread::Sleep(50); wxThread::Sleep(50);
} }
delete dialog; dialog.Destroy();
if (!thread.Wait()) if (!thread.Wait())
{ {