From 475bf6eb83c86ec89b9307ca9d4e465711169d27 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 27 Jan 2018 01:05:25 +0100 Subject: [PATCH] Small bug fixes in the package manager - Remove button wasn't enabled if multiple packages were selected - A potential crash on removing packages was fixed --- src/lay/lay/laySalt.cc | 7 ++++--- src/lay/lay/laySaltManagerDialog.cc | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/lay/lay/laySalt.cc b/src/lay/lay/laySalt.cc index 31b3886ee..fdeb1b3d3 100644 --- a/src/lay/lay/laySalt.cc +++ b/src/lay/lay/laySalt.cc @@ -279,12 +279,13 @@ Salt::remove_grain (const SaltGrain &grain) { emit collections_about_to_change (); - tl::info << QObject::tr ("Removing package '%1' ..").arg (tl::to_qstring (grain.name ())); + QString name = tl::to_qstring (grain.name ()); + tl::info << QObject::tr ("Removing package '%1' ..").arg (name); bool res = remove_from_collection (m_root, grain.name ()); if (res) { - tl::info << QObject::tr ("Package '%1' removed.").arg (tl::to_qstring (grain.name ())); + tl::info << QObject::tr ("Package '%1' removed.").arg (name); } else { - tl::warn << QObject::tr ("Failed to remove package '%1'.").arg (tl::to_qstring (grain.name ())); + tl::warn << QObject::tr ("Failed to remove package '%1'.").arg (name); } invalidate (); diff --git a/src/lay/lay/laySaltManagerDialog.cc b/src/lay/lay/laySaltManagerDialog.cc index 9f6dc0003..9ffa00582 100644 --- a/src/lay/lay/laySaltManagerDialog.cc +++ b/src/lay/lay/laySaltManagerDialog.cc @@ -858,12 +858,12 @@ SaltManagerDialog::selected_changed () details_text->set_grain (g); if (!g) { details_frame->setEnabled (false); - delete_button->setEnabled (false); } else { details_frame->setEnabled (true); - delete_button->setEnabled (true); edit_button->setEnabled (! g->is_readonly ()); } + + delete_button->setEnabled (! current_grains ().empty ()); } lay::SaltGrain *