Fix #5113: 'Choose skin' from model spawnarg: hitting cancel sets mod…

…el spawnarg as skin
codereader · Jan 7, 2020 · fe96658 · fe96658
1 parent 7d1a672
commit fe96658
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/include/version.h b/include/version.h
@@ -2,7 +2,7 @@
 #include <config.h>
 #define RADIANT_VERSION PACKAGE_VERSION
 #else
-#define RADIANT_VERSION "2.7.0pre3"
+#define RADIANT_VERSION "2.7.0pre4"
 #endif
 
 #define RADIANT_APPNAME "DarkRadiant"

diff --git a/radiant/ui/einspector/ModelPropertyEditor.cpp b/radiant/ui/einspector/ModelPropertyEditor.cpp
@@ -114,11 +114,14 @@ void ModelPropertyEditor::_onSkinButton(wxCommandEvent& ev)
 {
 	// Display the SkinChooser to get a skin from the user
 	std::string modelName = _entity->getKeyValue("model");
-	std::string prevSkin = _entity->getKeyValue(_key);
+	std::string prevSkin = _entity->getKeyValue("skin");
 	std::string skin = SkinChooser::chooseSkin(modelName, prevSkin);
 
-	// Apply the key to the entity
-	setKeyValue("skin", skin);
+	if (skin != prevSkin)
+	{
+		// Apply the key to the entity
+		setKeyValue("skin", skin);
+	}
 }
 
 }
diff --git a/tools/innosetup/darkradiant.iss b/tools/innosetup/darkradiant.iss
@@ -3,15 +3,15 @@
 
 [Setup]
 AppName=DarkRadiant
-AppVerName=DarkRadiant 2.7.0pre3 x86
+AppVerName=DarkRadiant 2.7.0pre4 x86
 AppPublisher=The Dark Mod
 AppPublisherURL=https://www.darkradiant.net
 AppSupportURL=https://www.darkradiant.net
 AppUpdatesURL=https://www.darkradiant.net
 DefaultDirName={pf}\DarkRadiant
-DefaultGroupName=DarkRadiant 2.7.0pre3 x86
+DefaultGroupName=DarkRadiant 2.7.0pre4 x86
 OutputDir=.
-OutputBaseFilename=darkradiant-2.7.0pre3-x86
+OutputBaseFilename=darkradiant-2.7.0pre4-x86
 Compression=lzma
 SolidCompression=yes
 ;ArchitecturesAllowed=x64

diff --git a/tools/innosetup/darkradiant.x64.iss b/tools/innosetup/darkradiant.x64.iss
@@ -3,15 +3,15 @@
 
 [Setup]
 AppName=DarkRadiant
-AppVerName=DarkRadiant 2.7.0pre3 x64
+AppVerName=DarkRadiant 2.7.0pre4 x64
 AppPublisher=The Dark Mod
 AppPublisherURL=https://www.darkradiant.net
 AppSupportURL=https://www.darkradiant.net
 AppUpdatesURL=https://www.darkradiant.net
 DefaultDirName={pf}\DarkRadiant
-DefaultGroupName=DarkRadiant 2.7.0pre3 x64
+DefaultGroupName=DarkRadiant 2.7.0pre4 x64
 OutputDir=.
-OutputBaseFilename=darkradiant-2.7.0pre3-x64
+OutputBaseFilename=darkradiant-2.7.0pre4-x64
 Compression=lzma
 SolidCompression=yes
 ArchitecturesAllowed=x64