Commit 4ffc46e2 authored by Joris Guisson's avatar Joris Guisson
Browse files

Ported rev 787725 (ConvertDialog crash fix)

svn path=/branches/ktorrent/3.0/; revision=787727
parent 753bb81a
......@@ -20,6 +20,7 @@ this makes sure that it is sized properly when you open the dialog
- Make sure speed settings are kept in sync between all the places where you
can change them (159039)
- Make sure that scheduler plugin does not set stuff in paused state twice (152445)
- Fix crash in ConvertDialog of ipfilter plugin
Changes in 3.O :
- Fix sorting of upload and download rate (157939)
......
......@@ -90,16 +90,18 @@ namespace kt
void ConvertDialog::threadFinished()
{
convert_thread->wait();
if (convert_thread->getFailureReason() != QString::null)
QString failure = convert_thread->getFailureReason();
if (failure != QString::null)
{
convert_thread->wait();
convert_thread->deleteLater();
convert_thread = 0;
KMessageBox::error(this,convert_thread->getFailureReason());
KMessageBox::error(this,failure);
reject();
}
else
{
convert_thread->wait();
convert_thread->deleteLater();
convert_thread = 0;
if (canceled)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment