mirror of
https://github.com/claunia/cuetools.net.git
synced 2025-12-16 18:14:25 +00:00
fixed crash when metadata window is closed before artwork is loaded
This commit is contained in:
1
CUETools.CTDB.EACPlugin/FormMetadata.Designer.cs
generated
1
CUETools.CTDB.EACPlugin/FormMetadata.Designer.cs
generated
@@ -54,6 +54,7 @@
|
|||||||
// backgroundWorker1
|
// backgroundWorker1
|
||||||
//
|
//
|
||||||
this.backgroundWorker1.WorkerReportsProgress = true;
|
this.backgroundWorker1.WorkerReportsProgress = true;
|
||||||
|
this.backgroundWorker1.WorkerSupportsCancellation = true;
|
||||||
this.backgroundWorker1.DoWork += new System.ComponentModel.DoWorkEventHandler(this.backgroundWorker1_DoWork);
|
this.backgroundWorker1.DoWork += new System.ComponentModel.DoWorkEventHandler(this.backgroundWorker1_DoWork);
|
||||||
this.backgroundWorker1.ProgressChanged += new System.ComponentModel.ProgressChangedEventHandler(this.backgroundWorker1_ProgressChanged);
|
this.backgroundWorker1.ProgressChanged += new System.ComponentModel.ProgressChangedEventHandler(this.backgroundWorker1_ProgressChanged);
|
||||||
this.backgroundWorker1.RunWorkerCompleted += new System.ComponentModel.RunWorkerCompletedEventHandler(this.backgroundWorker1_RunWorkerCompleted);
|
this.backgroundWorker1.RunWorkerCompleted += new System.ComponentModel.RunWorkerCompletedEventHandler(this.backgroundWorker1_RunWorkerCompleted);
|
||||||
|
|||||||
@@ -80,6 +80,10 @@ namespace CUETools.CTDB.EACPlugin
|
|||||||
{
|
{
|
||||||
backgroundWorker1.ReportProgress(0, metadata);
|
backgroundWorker1.ReportProgress(0, metadata);
|
||||||
}
|
}
|
||||||
|
if (backgroundWorker1.CancellationPending)
|
||||||
|
{
|
||||||
|
throw new Exception();
|
||||||
|
}
|
||||||
foreach (var coverart in metadata.coverart)
|
foreach (var coverart in metadata.coverart)
|
||||||
{
|
{
|
||||||
var uri = Options.CoversSearch == CTDBCoversSearch.Large ?
|
var uri = Options.CoversSearch == CTDBCoversSearch.Large ?
|
||||||
@@ -101,7 +105,7 @@ namespace CUETools.CTDB.EACPlugin
|
|||||||
|
|
||||||
public void Form1_DoubleClick(object sender, MouseEventArgs e)
|
public void Form1_DoubleClick(object sender, MouseEventArgs e)
|
||||||
{
|
{
|
||||||
if (this.m_currently_selected != null && !this.cdinfo)
|
if (this.m_currently_selected != null && !this.cdinfo && !backgroundWorker1.IsBusy)
|
||||||
{
|
{
|
||||||
this.DialogResult = DialogResult.OK;
|
this.DialogResult = DialogResult.OK;
|
||||||
}
|
}
|
||||||
@@ -219,7 +223,7 @@ namespace CUETools.CTDB.EACPlugin
|
|||||||
|
|
||||||
private void listView1_MouseDoubleClick(object sender, MouseEventArgs e)
|
private void listView1_MouseDoubleClick(object sender, MouseEventArgs e)
|
||||||
{
|
{
|
||||||
if (this.cdinfo)
|
if (this.cdinfo && !backgroundWorker1.IsBusy)
|
||||||
{
|
{
|
||||||
var ht = listView1.HitTest(e.Location);
|
var ht = listView1.HitTest(e.Location);
|
||||||
if (ht.Item != null)
|
if (ht.Item != null)
|
||||||
@@ -319,6 +323,13 @@ namespace CUETools.CTDB.EACPlugin
|
|||||||
|
|
||||||
private void FormMetadata_FormClosing(object sender, FormClosingEventArgs e)
|
private void FormMetadata_FormClosing(object sender, FormClosingEventArgs e)
|
||||||
{
|
{
|
||||||
|
if (backgroundWorker1.IsBusy)
|
||||||
|
{
|
||||||
|
backgroundWorker1.CancelAsync();
|
||||||
|
e.Cancel = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
Options.MetadataWindowSize = this.Size;
|
Options.MetadataWindowSize = this.Size;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -128,7 +128,7 @@
|
|||||||
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
|
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
|
||||||
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
|
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
|
||||||
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABQ
|
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABQ
|
||||||
CgAAAk1TRnQBSQFMAgEBAwEAARgBAAEYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
|
CgAAAk1TRnQBSQFMAgEBAwEAASABAAEgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
|
||||||
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
|
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
|
||||||
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
|
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
|
||||||
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
|
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
|
||||||
|
|||||||
Reference in New Issue
Block a user