DTux
/
rsyncui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug correction: when stopping a dl an error when prompted

This commit is contained in:
Daniel Tartavel 2023-03-11 13:53:05 +01:00
parent f40e4f9485
commit e10558ff5b
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mainwindow.cpp
View File

@ -983,7 +983,7 @@ void MainWindow::downloadFinished(int exitCode, QProcess::ExitStatus exitStatus)
tr("Rsync process crashed")); tr("Rsync process crashed"));
} }
//test result code of command (if 20 then command stopped by user) //test result code of command (if 20 then command stopped by user)
if (exitCode != 0) if (exitCode != 0 and this->stopDlAsked != true)
{ {
if (exitCode == 20) if (exitCode == 20)
{ {
@ -1006,7 +1006,7 @@ void MainWindow::downloadFinished(int exitCode, QProcess::ExitStatus exitStatus)
retry = true; retry = true;
} }
} }
this->stopDlAsked = false;
this->trayIcon->showMessage(a.applicationName(), tr("Download ") + aborted + "\n" + this->downloading.path, QSystemTrayIcon::Information); this->trayIcon->showMessage(a.applicationName(), tr("Download ") + aborted + "\n" + this->downloading.path, QSystemTrayIcon::Information);
// disconnecting signals to slots // disconnecting signals to slots
@ -1080,6 +1080,7 @@ void MainWindow::on_listDownload_itemClicked(QListWidgetItem *item)
if (reply == QMessageBox::Yes) if (reply == QMessageBox::Yes)
{ {
// stopping download // stopping download
this->stopDlAsked = true;
emit (stopDownloading(this->downloading.process)); emit (stopDownloading(this->downloading.process));
} }
}else }else
@ -1096,7 +1097,6 @@ void MainWindow::on_listDownload_itemClicked(QListWidgetItem *item)
// removing line from download list // removing line from download list
ui->listDownload->removeItemWidget(item); ui->listDownload->removeItemWidget(item);
delete item; delete item;
} }
} }
if (config.autosaveCheckbox->checkState() == Qt::Checked) if (config.autosaveCheckbox->checkState() == Qt::Checked)

1
mainwindow.h
View File

@ -120,6 +120,7 @@ class MainWindow : public QMainWindow
QSystemTrayIcon * trayIcon; QSystemTrayIcon * trayIcon;
QString icon = "/usr/share/icons/RsyncUI.png"; QString icon = "/usr/share/icons/RsyncUI.png";
bool rescan = false; bool rescan = false;
bool stopDlAsked;
QList<QString> UnitText { QList<QString> UnitText {
tr("B"), tr("B"),

3
tools.cpp
View File

@ -48,7 +48,7 @@ const vector<string> explode(const string& s, const char& c, int n = 0)
// return true in case of error // return true in case of error
bool testRsyncReturn(MainWindow * w, QProcess * myProcess) bool testRsyncReturn(MainWindow * w, QProcess * myProcess)
{ {
if (myProcess->exitStatus() != 0) if (myProcess->exitStatus() != 0 and w->stopDlAsked != true)
{ {
QMessageBox::warning( QMessageBox::warning(
w, w,
@ -58,6 +58,7 @@ bool testRsyncReturn(MainWindow * w, QProcess * myProcess)
QMessageBox::Ok); QMessageBox::Ok);
return true; return true;
} }
w->stopDlAsked = false;
return false; return false;
} }