From 2aa8c2f0e0fd29edec1935d225f78d0a317e4f64 Mon Sep 17 00:00:00 2001
From: dalto <dalto@fastmail.com>
Date: Wed, 19 Jan 2022 16:48:56 -0600
Subject: [PATCH] [packagechooser] Ensure multiple instances don't override the
 GS values

---
 src/modules/packagechooser/Config.cpp | 37 +++++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/src/modules/packagechooser/Config.cpp b/src/modules/packagechooser/Config.cpp
index abf6a640e..2f54442b7 100644
--- a/src/modules/packagechooser/Config.cpp
+++ b/src/modules/packagechooser/Config.cpp
@@ -132,13 +132,46 @@ Config::updateGlobalStorage( const QStringList& selected ) const
         }
         else
         {
-            Calamares::JobQueue::instance()->globalStorage()->insert( "NetinstallAdd", netinstallDataList );
+            auto* gs = Calamares::JobQueue::instance()->globalStorage();
+
+            // If an earlier packagechooser instance added this data to global storage, combine them
+            if ( gs->contains( "NetinstallAdd" ) )
+            {
+                auto netinstallAddOrig = gs->value( "NetinstallAdd" );
+                if ( netinstallAddOrig.canConvert( QVariant::List ) )
+                {
+                    netinstallDataList += netinstallAddOrig.toList();
+                }
+                else
+                {
+                    cWarning() << "Invalid NetinstallAdd data in global storage.  Earlier selections purged";
+                }
+                gs->remove( "NetinstallAdd" );
+            }
+            gs->insert( "NetinstallAdd", netinstallDataList );
         }
     }
     else if ( m_method == PackageChooserMethod::NetSelect )
     {
         cDebug() << m_defaultId << "groups to select in netinstall" << selected;
-        Calamares::JobQueue::instance()->globalStorage()->insert( "NetinstallSelect", selected );
+        QStringList newSelected = selected;
+        auto* gs = Calamares::JobQueue::instance()->globalStorage();
+
+        // If an earlier packagechooser instance added this data to global storage, combine them
+        if ( gs->contains( "NetinstallSelect" ) )
+        {
+            auto selectedOrig = gs->value( "NetinstallSelect" );
+            if ( selectedOrig.canConvert( QVariant::StringList ) )
+            {
+                newSelected += selectedOrig.toStringList();
+            }
+            else
+            {
+                cWarning() << "Invalid NetinstallSelect data in global storage.  Earlier selections purged";
+            }
+            gs->remove( "NetinstallSelect" );
+        }
+        gs->insert( "NetinstallSelect", newSelected );
     }
     else
     {