R-YaTian/TinkeDSi
1
Fork 0
mirror of https://github.com/R-YaTian/TinkeDSi.git synced 2025-06-18 16:45:43 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Espera: more fix. thanks @MetLob

Browse Source
This commit is contained in:
R-YaTian 2023-04-15 11:35:38 +08:00 committed by GitHub
parent e6dc146df5
commit 82b9f6f867
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Tinke/Espera.cs
View File

@ -80,5 +80,17 @@ namespace Tinke
this.Text = xml.Element("S01").Value;
label1.Text = xml.Element("S01").Value;
}
public void CloseLoadingForm()
{
this.DialogResult = DialogResult.OK;
this.Close();
this.progressBar1.Dispose();
if (label1.Image != null)
{
label1.Image.Dispose();
}
}
}
}

58
Tinke/Sistema.cs
View File

@ -51,7 +51,7 @@ namespace Tinke
bool isMono;
Keys keyDown;
bool stop;
Espera espera;
private Espera espera;
public static bool twl_flag;
public Sistema()
@ -174,9 +174,7 @@ namespace Tinke
if (!isMono)
{
try {
espera.Close();
} catch { };
CloseEspera(loadrom);
debug = new Debug();
debug.FormClosing += new FormClosingEventHandler(debug_FormClosing);
debug.Add_Text(sb.ToString());
@ -697,10 +695,20 @@ namespace Tinke
private void ThreadEspera(Object name)
{
espera = new Espera((string)name, false);
this.espera = new Espera((string)name, false);
espera.TopMost = true;
espera.ShowDialog();
}
private void CloseEspera(Thread thread)
{
if (this.espera != null)
{
this.espera.BeginInvoke(new ThreadStart(this.espera.CloseLoadingForm));
this.espera = null;
thread = null;
}
}
#endregion
#region Create Nodes
@ -1280,11 +1288,7 @@ namespace Tinke
if (!isMono)
{
try
{
espera.Close();
}
catch { };
CloseEspera(unpack);
debug.Add_Text(sb.ToString());
}
sb.Length = 0;
@ -1380,11 +1384,7 @@ namespace Tinke
extract.Start("S03");
RecursivoExtractFolder(folderSelect, o.SelectedPath + Path.DirectorySeparatorChar + folderSelect.name);
if (!isMono)
try
{
espera.Close();
}
catch { };
CloseEspera(extract);
}
}
private void RecursivoExtractFolder(sFolder currFolder, String path)
@ -1853,11 +1853,7 @@ namespace Tinke
#endregion
if (!isMono)
try
{
espera.Close();
}
catch { };
CloseEspera(create);
// Obtenemos el nuevo archivo para guardar
SaveFileDialog o = new SaveFileDialog();
@ -1916,11 +1912,7 @@ namespace Tinke
if (!isMono)
{
try
{
espera.Close();
}
catch { };
CloseEspera(saverom);
debug.Add_Text(sb.ToString());
}
sb.Length = 0;
@ -2220,9 +2212,7 @@ namespace Tinke
if (!(uncompress.files is List<sFile>) || dialog.DialogResult != System.Windows.Forms.DialogResult.OK)
{
if (!isMono)
wait.Abort();
CloseEspera(wait);
MessageBox.Show(Tools.Helper.GetTranslation("Sistema", "S36"));
return;
}
@ -2450,11 +2440,7 @@ namespace Tinke
treeSystem.EndUpdate();
if (!isMono && waiting.ThreadState == ThreadState.Running)
try
{
espera.Close();
}
catch { };
CloseEspera(waiting);
}
private void txtSearch_TextChanged(object sender, EventArgs e)
{
@ -2529,11 +2515,7 @@ namespace Tinke
if (FBD.ShowDialog() != DialogResult.OK)
{
if (!isMono)
try
{
espera.Close();
}
catch { };
CloseEspera(matching);
return;
}