Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix occasional crash when favicon progress dialog is closed #1980

Merged
merged 2 commits into from
May 21, 2018
Merged

Fix occasional crash when favicon progress dialog is closed #1980

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac2a996
Fix occasional crash when favicon progress dialog is closed
droidmonkey May 19, 2018
3ed709b
Code style
droidmonkey May 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions src/gui/EditWidgetIcons.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,13 @@ UrlFetchProgressDialog::UrlFetchProgressDialog(const QUrl &url, QWidget *parent)
setWindowTitle(tr("Download Progress"));
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
setLabelText(tr("Downloading %1.").arg(url.toDisplayString()));
setMinimum(0);
setValue(0);
setMinimumDuration(0);
setMinimumDuration(2000);
setMinimumSize(QSize(400, 75));
}

void UrlFetchProgressDialog::networkReplyProgress(qint64 bytesRead, qint64 totalBytes)
{
setMaximum(totalBytes);
setValue(bytesRead);
setValue(static_cast<int>(bytesRead / totalBytes));
}

EditWidgetIcons::EditWidgetIcons(QWidget* parent)
Expand Down Expand Up @@ -280,7 +277,9 @@ void EditWidgetIcons::fetchFinished()
void EditWidgetIcons::fetchCanceled()
{
#ifdef WITH_XC_NETWORKING
m_reply->abort();
if (m_reply) {
m_reply->abort();
}
#endif
}

Expand Down