From 0dc594b3f12c3b924d787ec940253b1e57bc9d31 Mon Sep 17 00:00:00 2001 From: Pluto Date: Fri, 8 Jul 2022 09:37:36 +0000 Subject: [PATCH] =?UTF-8?q?!56=20=E4=BF=AE=E5=A4=8D=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E6=8F=90=E5=89=8D=E9=80=80=E5=87=BA=20*=20=09=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=9A=20=20=20=20=20src/main.cpp=20*=20=09?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=20=20=20=20=20debian/changelog=20*?= =?UTF-8?q?=20fix:=20waitforfinished?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 8 ++++++++ src/downloadworker.cpp | 6 ++---- src/main.cpp | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index be1685e..9ec283a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +spark-store (3.1.3-1) stable; urgency=medium + + * 修复 下载提前退出 + * 移除 下载量显示 + + + -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + spark-store (3.1.3) stable; urgency=medium * Now uses aria2 to download softwares form all mirrors diff --git a/src/downloadworker.cpp b/src/downloadworker.cpp index 527a493..d95b7e8 100644 --- a/src/downloadworker.cpp +++ b/src/downloadworker.cpp @@ -176,11 +176,9 @@ void DownloadController::startDownload(const QString &url) auto pidNumber = cmd->processId(); this->pidNumber = pidNumber; - int statusSum = 0; - while (statusSum > -20) + while (cmd->waitForFinished(-1)) { - auto status = cmd->waitForFinished() - 1; - statusSum += status; + continue; } emit downloadFinished(); }); diff --git a/src/main.cpp b/src/main.cpp index dcfc29c..dd1dabf 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -30,7 +30,7 @@ int main(int argc, char *argv[]) DAboutDialog dialog; a.setAboutDialog(&dialog); dialog.setLicense(QObject::tr("We publish this program under GPL V3")); - dialog.setVersion(DApplication::buildVersion("Version 3.1.3")); + dialog.setVersion(DApplication::buildVersion("Version 3.1.3-1")); dialog.setProductIcon(QIcon::fromTheme("spark-store")); // 设置Logo dialog.setProductName(QLabel::tr("Spark Store")); dialog.setDescription( @@ -51,7 +51,7 @@ int main(int argc, char *argv[]) a.setOrganizationName("spark-union"); a.setOrganizationDomain("https://www.deepinos.org/"); a.setApplicationName("Spark Store"); //不需要翻译,否则 ~/.local/share/ 下文件夹名称也被翻译为中文 - a.setApplicationVersion(DApplication::buildVersion("3.2")); + a.setApplicationVersion(DApplication::buildVersion("3.1.3-1")); a.setApplicationAcknowledgementPage("https://gitee.com/deepin-community-store/spark-store"); a.setApplicationDescription( QObject::tr(