Merge branch 'dev' of https://github.com/gwdevhub/GWToolboxpp into dev

# Conflicts: # GWToolboxdll/Widgets/Minimap/GameWorldRenderer.h
gwdevhub · Jul 27, 2024 · 17c4cc7 · 17c4cc7
2 parents e946e16 + 1188225
commit 17c4cc7
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/GWToolboxdll/Widgets/Minimap/GameWorldRenderer.h b/GWToolboxdll/Widgets/Minimap/GameWorldRenderer.h
@@ -34,12 +34,19 @@ class GameWorldRenderer {
 
  GenericPolyRenderable& operator=(GenericPolyRenderable&& other) noexcept
  {
+ if (vb && vb != other.vb) {
+ vb->Release();
+ }
  vb = other.vb; // Move the buffer!
  other.vb = nullptr;
  points = std::move(other.points);
- other.points.clear();
  vertices = std::move(other.vertices);
- other.vertices.clear();
+
+ map_id = other.map_id;
+ col = other.col;
+ filled = other.filled;
+ vertices_processed = other.vertices_processed;
+
  return *this;
  }