MenuToolViewStack no longer resets choice to null when in ComboBox

always-show-prompt mode
WeaveTeam · Aug 10, 2015 · f9c8f08 · f9c8f08
1 parent 2f8159c
commit f9c8f08
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/WeaveUI/src/weave/ui/MenuToolViewStack.mxml b/WeaveUI/src/weave/ui/MenuToolViewStack.mxml
@@ -38,10 +38,12 @@
 						prompt="{prompt}">
 			<ui:valueCommit>
 				<![CDATA[
-					if (!_settingComboSelection && !viewChanging && layoutMode == LAYOUT_COMBO && UIUtils.hasFocus(choiceCombo))
+					if (!_settingComboSelection && !viewChanging && layoutMode == LAYOUT_COMBO && UIUtils.hasFocus(choiceCombo) && choiceCombo.selectedItem)
 					{
 						_settingComboSelection = true;
 						chosenItem = choiceCombo.selectedItem;
+						if (alwaysShowPrompt)
+							choiceCombo.selectedIndex = -1;
 						_settingComboSelection = false;
 					}
 				]]>