From 1c794591b97820d4f0fcc91c0fa43bd34c9d5c79 Mon Sep 17 00:00:00 2001
From: Michele Caini <michele.caini@gmail.com>
Date: Fri, 12 Feb 2021 15:47:52 +0100
Subject: [PATCH] sparse_set: review sort_n

---
 src/entt/entity/sparse_set.hpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/entt/entity/sparse_set.hpp b/src/entt/entity/sparse_set.hpp
index 3d843b2e9..6d738cb17 100644
--- a/src/entt/entity/sparse_set.hpp
+++ b/src/entt/entity/sparse_set.hpp
@@ -511,11 +511,14 @@ public:
             auto next = index(packed[curr]);
 
             while(curr != next) {
-                swap_at(next, index(packed[next]));
-                sparse[page(packed[curr])][offset(packed[curr])] = entity_type{static_cast<typename traits_type::entity_type>(curr)};
+                const auto idx = index(packed[next]);
+                const auto entt = packed[curr];
+
+                swap_at(next, idx);
+                sparse[page(entt)][offset(entt)] = entity_type{static_cast<typename traits_type::entity_type>(curr)};
 
                 curr = next;
-                next = index(packed[curr]);
+                next = idx;
             }
         }
     }