Merge pull request #3263 from canonical/fix-empty-snapshot-args

[snapshots] Fix interpreting empty snapshot name in snapshot args r=sharder996 a=ricab
canonical · Oct 20, 2023 · 377aca2 · 377aca2
2 parents ab0f815 + 3a5b364
commit 377aca2
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/daemon/daemon.cpp b/src/daemon/daemon.cpp
@@ -1167,13 +1167,12 @@ InstanceSnapshotsMap map_snapshots_to_instances(const InstanceSnapshotPairs& ins
     for (const auto& it : instances_snapshots)
     {
         const auto& instance = it.instance_name();
-        const auto& snapshot = it.snapshot_name();
         auto& snapshot_pick = instance_snapshots_map[instance];
 
-        if (snapshot.empty())
+        if (!it.has_snapshot_name())
             snapshot_pick.all_or_none = true;
         else
-            snapshot_pick.pick.insert(snapshot);
+            snapshot_pick.pick.insert(it.snapshot_name());
     }
 
     return instance_snapshots_map;