#4483: Revert the fix to resolve #4482 for the moment being

codereader · Feb 7, 2017 · 6ce44c0 · 6ce44c0
1 parent 8d06ab5
commit 6ce44c0
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/configure.ac b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([darkradiant], [2.2.0])
+AC_INIT([darkradiant], [2.2.1])
 AM_INIT_AUTOMAKE([subdir-objects])
 AM_SILENT_RULES([yes])
 

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.2.0"
+#define RADIANT_VERSION "2.2.1"
 #endif
 
 #define RADIANT_APPNAME "DarkRadiant"

diff --git a/plugins/uimanager/menu/MenuManager.cpp b/plugins/uimanager/menu/MenuManager.cpp
@@ -187,13 +187,15 @@ void MenuManager::handleElementAdded(const MenuElementPtr& element)
 		parentMenu->setNeedsRefresh(true);
 	}
 
+#if 0
 	// When inserting a new menu in a menubar, make sure it is constructed
 	if (element->getParent() &&
 		std::dynamic_pointer_cast<MenuBar>(element->getParent()) &&
 		std::static_pointer_cast<MenuBar>(element->getParent())->getMenuBar() != nullptr)
 	{
 		std::static_pointer_cast<MenuBar>(element->getParent())->ensureMenusConstructed();
 	}
+#endif
 }
 
 void MenuManager::handleElementRemoved(const MenuElementPtr& element)

diff --git a/tools/innosetup/darkradiant.iss b/tools/innosetup/darkradiant.iss
@@ -3,15 +3,15 @@
 
 [Setup]
 AppName=DarkRadiant
-AppVerName=DarkRadiant 2.2.0 x86
+AppVerName=DarkRadiant 2.2.1 x86
 AppPublisher=The Dark Mod
 AppPublisherURL=http://www.thedarkmod.com
 AppSupportURL=http://www.thedarkmod.com
 AppUpdatesURL=http://www.thedarkmod.com
 DefaultDirName={pf}\DarkRadiant
-DefaultGroupName=DarkRadiant 2.2.0 x86
+DefaultGroupName=DarkRadiant 2.2.1 x86
 OutputDir=.
-OutputBaseFilename=darkradiant-2.2.0-x86
+OutputBaseFilename=darkradiant-2.2.1-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.2.0 x64
+AppVerName=DarkRadiant 2.2.1 x64
 AppPublisher=The Dark Mod
 AppPublisherURL=http://www.thedarkmod.com
 AppSupportURL=http://www.thedarkmod.com
 AppUpdatesURL=http://www.thedarkmod.com
 DefaultDirName={pf}\DarkRadiant
-DefaultGroupName=DarkRadiant 2.2.0 x64
+DefaultGroupName=DarkRadiant 2.2.1 x64
 OutputDir=.
-OutputBaseFilename=darkradiant-2.2.0-x64
+OutputBaseFilename=darkradiant-2.2.1-x64
 Compression=lzma
 SolidCompression=yes
 ArchitecturesAllowed=x64