Patch #1171300: ListWidget + Chooser Patch

svn-id: r17260

gui/ListWidget.cpp

@@ -380,6 +380,8 @@ void ListWidget::startEditMode() {
 }
 
 void ListWidget::endEditMode() {
+	if(!_editMode)
+		return;
 	// send a message that editing finished with a return/enter key press
 	_editMode = false;
 	_list[_selectedItem] = _editString;

gui/ListWidget.h

@@ -86,6 +86,7 @@ public:
 
 	// Made startEditMode for SCUMM's SaveLoadChooser
 	void startEditMode();
+	void endEditMode();
 
 protected:
 	void drawWidget(bool hilite);
@@ -93,7 +94,6 @@ protected:
 	int findItem(int x, int y) const;
 	void scrollBarRecalc();
 
-	void endEditMode();
 	void abortEditMode();
 	
 	Common::Rect getEditRect() const;

gui/chooser.cpp

@@ -53,6 +53,7 @@ void ChooserDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data
 	switch (cmd) {
 	case kChooseCmd:
 	case kListItemDoubleClickedCmd:
+		_list->endEditMode();
 		setResult(item);
 		close();
 		break;