Mercurial > trustbridge
changeset 669:7147550ee15d
Always include previous certificates in choices for the installer
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Thu, 26 Jun 2014 17:42:52 +0200 |
| parents | ef6d3dc9e930 |
| children | 175370634226 |
| files | ui/mainwindow.cpp |
| diffstat | 1 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ui/mainwindow.cpp Thu Jun 26 17:42:24 2014 +0200 +++ b/ui/mainwindow.cpp Thu Jun 26 17:42:52 2014 +0200 @@ -939,7 +939,12 @@ choices << mUpdatesNew->selectedCertificates(); choices << mUpdatesRemove->selectedCertificates(); - choices << mUpdatesManual->selectedCertificates(); + choices << mUpdatesManual->selectedCertificates(); + + /* Also include the old certificates */ + choices << mInstallList->selectedCertificates(); + choices << mRemoveList->selectedCertificates(); + QStringList unselectedManuals = mUpdatesManual->unselectedCertificates(); for(int i = 0; i < unselectedManuals.size(); i++) { if (unselectedManuals.at(i).startsWith("I:")) {