1. в комбобоксе не срабатывал хоткей для текущего элемента.

FarGroup · Apr 28, 2016 · 69c0447 · 69c0447
1 parent ec02ef0
commit 69c0447
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/far/changelog b/far/changelog
@@ -1,4 +1,8 @@
-drkns 28.04.2016 10:40:27 +0200 - build 4642
+zg 28.04.2016 13:20:04 +0200 - build 4643
+
+1. в комбобоксе не срабатывал хоткей для текущего элемента.
+
+drkns 28.04.2016 10:40:27 +0200 - build 4642
 
 1. Уточнение 4631.
 

diff --git a/far/vbuild.m4 b/far/vbuild.m4
@@ -1 +1 @@
-m4_define(BUILD,4642)m4_dnl
+m4_define(BUILD,4643)m4_dnl
diff --git a/far/vmenu.cpp b/far/vmenu.cpp
@@ -1482,19 +1482,16 @@ int VMenu::ProcessKey(const Manager::Key& Key)
 				}
 				else
 				{
-					if (NewPos != OldSelectPos)
+					if (NewPos != OldSelectPos && SetSelectPos(NewPos, 1) < 0)
 					{
-						if (SetSelectPos(NewPos, 1) < 0)
-						{
-							ClearDone();
-						}
-						else
-						{
-							CheckFlags(VMENU_COMBOBOX) ? Close(GetExitCode()) : ClearDone();
-						}
-
-						break;
+						ClearDone();
 					}
+					else
+					{
+						CheckFlags(VMENU_COMBOBOX) ? Close(GetExitCode()) : ClearDone();
+					}
+
+					break;
 				}
 			}