ShaderClipboard can clear itself after map is loaded

codereader · Jan 29, 2017 · 93dff6b · 93dff6b
1 parent b58dede
commit 93dff6b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/radiant/map/Map.cpp b/radiant/map/Map.cpp
@@ -48,7 +48,6 @@
 #include "selection/algorithm/Primitives.h"
 #include "selection/algorithm/Group.h"
 #include "selection/algorithm/Transformation.h"
-#include "selection/shaderclipboard/ShaderClipboard.h"
 #include "modulesystem/ModuleRegistry.h"
 #include "modulesystem/StaticModule.h"
 #include "RenderableAasFile.h"
@@ -414,9 +413,6 @@ void Map::load(const std::string& filename) {
     // Move the view to a start position
     gotoStartPosition();
 
-    // Clear the shaderclipboard, the references are most probably invalid now
-    GlobalShaderClipboard().clear();
-
     // Let the filtersystem update the filtered status of all instances
     GlobalFilterSystem().update();
 

diff --git a/radiant/selection/shaderclipboard/ShaderClipboard.cpp b/radiant/selection/shaderclipboard/ShaderClipboard.cpp
@@ -169,8 +169,9 @@ sigc::signal<void> ShaderClipboard::signal_sourceChanged() const
 
 void ShaderClipboard::onMapEvent(IMap::MapEvent ev)
 {
-	if (ev == IMap::MapUnloading)
+	if (ev == IMap::MapUnloading || ev == IMap::MapLoaded)
 	{
+		// Clear the shaderclipboard, the references are most probably invalid now
 		clear();
 	}
 }