From 3e6a9ddd5ab9a3d8891a8e076e49c6b2335de73a Mon Sep 17 00:00:00 2001
From: elecpower <neilh713@tpg.com.au>
Date: Fri, 26 Aug 2022 14:17:21 +1000
Subject: [PATCH] Fix sounds chooser cancel action and improve progress
 messaging

---
 companion/src/updates/updatesounds.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/companion/src/updates/updatesounds.cpp b/companion/src/updates/updatesounds.cpp
index 6e81cfcab..c05cf799f 100644
--- a/companion/src/updates/updatesounds.cpp
+++ b/companion/src/updates/updatesounds.cpp
@@ -46,7 +46,7 @@ UpdateSounds::~UpdateSounds()
 
 bool UpdateSounds::flagAssets()
 {
-  progressMessage(tr("Flagging assets"));
+  progressMessage(tr("Processing available sounds"));
 
   QString pattern("sounds.json");
   assets->setFilterPattern(pattern);
@@ -125,11 +125,11 @@ bool UpdateSounds::flagAssets()
   if (langPacks->rowCount() > 1) {
     ChooserDialog *dlg = new ChooserDialog(nullptr, tr("Choose Language Packs"), langPacks);
 
-    dlg->exec();
+    bool ok = dlg->exec();
 
     QItemSelectionModel *selItems = dlg->selectedItems();
 
-    if (!selItems->hasSelection()) {
+    if (!ok || !selItems->hasSelection()) {
       QMessageBox::warning(this, CPN_STR_APP_NAME, tr("No language packs have been selected. Sounds update will be skipped!"));
       dlg->deleteLater();
       return true;
@@ -154,6 +154,8 @@ bool UpdateSounds::flagAssets()
 
 bool UpdateSounds::flagLanguageAsset(QString lang)
 {
+  progressMessage(tr("Flagging assets"));
+
   runParams->data.language = lang;
   UpdateParameters::AssetParams ap = runParams->data.assets[0];
   return getSetAssets(ap);