Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-02-17 13:02:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix occasional crash when favicon progress dialog is closed (#1980)

Browse Source 
* Changed progress dialog to a true percentage calculation
* Removed some unnecessary code
This commit is contained in:
Jonathan White 2018-05-20 21:12:06 -04:00 committed by GitHub
parent b9fa06c890
commit b16447b13d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/EditWidgetIcons.cpp
View File

@ -45,16 +45,13 @@ UrlFetchProgressDialog::UrlFetchProgressDialog(const QUrl &url, QWidget *parent)
setWindowTitle(tr("Download Progress")); setWindowTitle(tr("Download Progress"));
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
setLabelText(tr("Downloading %1.").arg(url.toDisplayString())); setLabelText(tr("Downloading %1.").arg(url.toDisplayString()));
setMinimum(0); setMinimumDuration(2000);
setValue(0);
setMinimumDuration(0);
setMinimumSize(QSize(400, 75)); setMinimumSize(QSize(400, 75));
} }
void UrlFetchProgressDialog::networkReplyProgress(qint64 bytesRead, qint64 totalBytes) void UrlFetchProgressDialog::networkReplyProgress(qint64 bytesRead, qint64 totalBytes)
{ {
setMaximum(totalBytes); setValue(static_cast<int>(bytesRead / totalBytes));
setValue(bytesRead);
} }
EditWidgetIcons::EditWidgetIcons(QWidget* parent) EditWidgetIcons::EditWidgetIcons(QWidget* parent)
@ -280,7 +277,9 @@ void EditWidgetIcons::fetchFinished()
void EditWidgetIcons::fetchCanceled() void EditWidgetIcons::fetchCanceled()
{ {
#ifdef WITH_XC_NETWORKING #ifdef WITH_XC_NETWORKING
m_reply->abort(); if (m_reply) {
m_reply->abort();
}
#endif #endif
} }