#452 Fix external command saving into settings file

cbucher · Sep 27, 2017 · 2e80153 · 2e80153
1 parent 4bdf27a
commit 2e80153
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/Console/SettingsHandler.cpp b/Console/SettingsHandler.cpp
@@ -2237,7 +2237,7 @@ bool HotKeys::Save(const CComPtr<IXMLDOMElement>& pSettingsRoot)
 		if( i->empty() ) continue;
 
 		CComPtr<IXMLDOMElement> pNewExternalCommandElement;
-		if( FAILED(XmlHelper::CreateDomElement(pSettingsRoot, CComBSTR(L"external_command"), pNewExternalCommandElement)) ) return false;
+		if( FAILED(XmlHelper::CreateDomElement(pExternalCommandsElement, CComBSTR(L"external_command"), pNewExternalCommandElement)) ) return false;
 
 		XmlHelper::SetAttribute(pNewExternalCommandElement, CComBSTR(L"id"), static_cast<int>(i - externalCommands.begin() + 1));
 		XmlHelper::SetAttribute(pNewExternalCommandElement, CComBSTR(L"value"), *i);

diff --git a/Console/SettingsHandler.h b/Console/SettingsHandler.h
@@ -730,7 +730,7 @@ struct HotKeys : public SettingsBase
 
 	Commands	commands;
 
-	std::array<std::wstring, ID_EXTERNAL_COMMAND_1> externalCommands;
+	std::array<std::wstring, EXTERNAL_COMMANDS_COUNT> externalCommands;
 
 	bool		bUseScrollLock;
 };

diff --git a/Console/stdafx.h b/Console/stdafx.h
@@ -152,6 +152,18 @@ using namespace boost::multi_index;
 #include "../shared/Win32Exception.h"
 #include "../shared/Cpp11Helpers.h"
 #include "../shared/NamedPipe.h"
+
+//////////////////////////////////////////////////////////////////////////////
+
+
+//////////////////////////////////////////////////////////////////////////////
+#define EXTERNAL_COMMANDS_COUNT 10
+#define SEARCH_MRU_COUNT        10
+
+//////////////////////////////////////////////////////////////////////////////
+
+
+//////////////////////////////////////////////////////////////////////////////
 #include "Helpers.h"
 #include "XmlHelper.h"
 #include "ImageHandler.h"
@@ -242,13 +254,6 @@ using namespace boost::multi_index;
 //////////////////////////////////////////////////////////////////////////////
 
 
-//////////////////////////////////////////////////////////////////////////////
-#define EXTERNAL_COMMANDS_COUNT 10
-#define SEARCH_MRU_COUNT        10
-
-//////////////////////////////////////////////////////////////////////////////
-
-
 //////////////////////////////////////////////////////////////////////////////
 // pseudo SCROLL constant
 #define SB_WHEEL 99