Skip to content

M
magicseteditor
Commit e4996417 authored by twanvl's avatar twanvl
Browse files
Options

fixed: packages can now be upgraded from installers, their status was not updated

parent fdf602ed
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
src/gui/packages_window.cpp
View file @ e4996417
...@@ -181,6 +181,7 @@ PackagesWindow::PackagesWindow(Window* parent, const InstallerP& installer) ...@@ -181,6 +181,7 @@ PackagesWindow::PackagesWindow(Window* parent, const InstallerP& installer)
init(parent, true); init(parent, true);
// add installer // add installer
merge(installable_packages, new_intrusive1<DownloadableInstaller>(installer)); merge(installable_packages, new_intrusive1<DownloadableInstaller>(installer));
FOR_EACH(p, installable_packages) p->determineStatus();
// mark all packages in the installer for installation // mark all packages in the installer for installation
FOR_EACH(ip, installable_packages) { FOR_EACH(ip, installable_packages) {
if (ip->can(PACKAGE_INSTALL)) { if (ip->can(PACKAGE_INSTALL)) {
...@@ -280,6 +281,11 @@ void PackagesWindow::onOk(wxCommandEvent& ev) { ...@@ -280,6 +281,11 @@ void PackagesWindow::onOk(wxCommandEvent& ev) {
if ((ip->status & PACKAGE_MODIFIED) == PACKAGE_MODIFIED) with_modifications++; if ((ip->status & PACKAGE_MODIFIED) == PACKAGE_MODIFIED) with_modifications++;
} }
} }
// anything to do?
if (!to_change) {
ev.Skip();
return;
}
// Warn about removing // Warn about removing
if (to_remove) { if (to_remove) {
int result = wxMessageBox( int result = wxMessageBox(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment