MenuNumPicker: Fix item duplication when game is closed

Fixes #1894

Author: dorkster

RELEASE_NOTES.txt

@@ -79,6 +79,7 @@ Engine fixes:
 * Fixed crash in action bar when less than 12 slots were defined.
 * Fixed single-line text having the top/bottom "cut off" with certain fonts.
 * Fixed delete save dialog being shown underneath buttons on load screen.
+* Fixed bug where closing the game with the "Enter Amount" dialog open allowed for item duplication.
 * Android: Fix 'Flare' directory not being automatically created.
 * Android: Added a dialog to direct the player to the wiki page for installing if no game data is found.
 

src/MenuManager.cpp

@@ -367,12 +367,9 @@ void MenuManager::logic() {
 		}
 		else if (num_picker->cancel_clicked) {
 			// cancel item dragging
-			drag_stack.quantity = 0;
-			drag_stack.item = 0;
+			drag_stack.clear();
+			num_picker->closeWindow();
 			resetDrag();
-			num_picker->cancel_clicked = false;
-			num_picker->visible = false;
-			num_picker->tablist.defocus();
 		}
 		else {
 			pause = true;
@@ -1644,13 +1641,17 @@ void MenuManager::closeAll() {
 }
 
 void MenuManager::closeLeft() {
+	if (num_picker->visible) {
+		drag_stack.clear();
+		num_picker->closeWindow();
+	}
+
 	resetDrag();
 	chr->visible = false;
 	questlog->visible = false;
 	exit->visible = false;
 	stash->visible = false;
 	book->setBookFilename("");
-	num_picker->visible = false;
 
 	talker->setNPC(NULL);
 	vendor->setNPC(NULL);
@@ -1663,12 +1664,16 @@ void MenuManager::closeLeft() {
 }
 
 void MenuManager::closeRight() {
+	if (num_picker->visible) {
+		drag_stack.clear();
+		num_picker->closeWindow();
+	}
+
 	resetDrag();
 	inv->visible = false;
 	pow->visible = false;
 	exit->visible = false;
 	book->setBookFilename("");
-	num_picker->visible = false;
 
 	talker->setNPC(NULL);
 

src/MenuNumPicker.cpp

@@ -247,6 +247,13 @@ void MenuNumPicker::updateInput() {
 	input_box->setText(ss.str());
 }
 
+void MenuNumPicker::closeWindow() {
+	confirm_clicked = false;
+	cancel_clicked = false;
+	visible = false;
+	tablist.defocus();
+}
+
 MenuNumPicker::~MenuNumPicker() {
 	delete button_ok;
 	delete button_up;

src/MenuNumPicker.h

@@ -62,6 +62,7 @@ class MenuNumPicker : public Menu {
 	void increaseValue(int val);
 	void decreaseValue(int val);
 	int getValue();
+	void closeWindow();
 
 	bool confirm_clicked;
 	bool cancel_clicked;

src/Version.cpp

@@ -30,7 +30,7 @@ FLARE.  If not, see http://www.gnu.org/licenses/
 
 #include <SDL.h>
 
-Version VersionInfo::ENGINE(1, 14, 102);
+Version VersionInfo::ENGINE(1, 14, 103);
 Version VersionInfo::MIN(0, 0, 0);
 Version VersionInfo::MAX(USHRT_MAX, USHRT_MAX, USHRT_MAX);