more 5030.3

far/changelog

@@ -1,3 +1,7 @@
+drkns 20.09.2017 21:35:37 +0100 - build 5035
+
+1. Продолжение 5030.3.
+
 drkns 20.09.2017 07:37:25 +0100 - build 5034
 
 1. Уточнение 5032.

far/shortcuts.cpp

@@ -510,18 +510,19 @@ int Shortcuts::Configure()
 			UpdateItem();
 		};
 
-		auto& CurrentList = AllShortcuts[Pos].m_Items;
+		auto& CurrentList = AllShortcuts[Pos];
 
 		switch (Key)
 		{
 		case KEY_NUMPAD0:
 		case KEY_INS:
 			// Direct insertion only allowed if the list is empty. Otherwise do it in a submenu.
-			if (CurrentList.empty())
+			if (CurrentList.m_Items.empty())
 			{
 				if (Accept())
 				{
-					CurrentList.emplace_back(CreateShortcutFromPanel());
+					CurrentList.m_Items.emplace_back(CreateShortcutFromPanel());
+					CurrentList.m_Changed = true;
 					UpdateItem();
 				}
 			}
@@ -533,12 +534,13 @@ int Shortcuts::Configure()
 
 		case KEY_NUMDEL:
 		case KEY_DEL:
-			if (!CurrentList.empty())
+			if (!CurrentList.m_Items.empty())
 			{
 				// Direct deletion only allowed if there's exactly one item in the list. Otherwise do it in a submenu.
-				if (CurrentList.size() == 1)
+				if (CurrentList.m_Items.size() == 1)
 				{
-					CurrentList.pop_front();
+					CurrentList.m_Items.pop_front();
+					CurrentList.m_Changed = true;
 					UpdateItem();
 				}
 				else
@@ -549,13 +551,14 @@ int Shortcuts::Configure()
 			return true;
 
 		case KEY_F4:
-			if (!CurrentList.empty())
+			if (!CurrentList.m_Items.empty())
 			{
 				// Direct editing only allowed if there's exactly one item in the list. Otherwise do it in a submenu.
-				if (CurrentList.size() == 1)
+				if (CurrentList.m_Items.size() == 1)
 				{
-					if (EditListItem(AllShortcuts[Pos].m_Items, *FolderList, CurrentList.front(), true))
+					if (EditListItem(AllShortcuts[Pos].m_Items, *FolderList, CurrentList.m_Items.front(), true))
 					{
+						CurrentList.m_Changed = true;
 						UpdateItem();
 					}
 				}

far/vbuild.m4

@@ -1 +1 @@
-m4_define(BUILD,5034)m4_dnl
+m4_define(BUILD,5035)m4_dnl