[Scummvm-cvs-logs] scummvm master -> 6a1112f98ff3739dde809275f1d09951b9a20ec6

[lordhoto]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
ddcfdf5329 GUI: Allow the event recorder dialog to be closed.
6a1112f98f GUI: Mark some intentional fall throughs in switches.


Commit: ddcfdf532927a3b31f0dd7033be5805fa38db15f
    https://github.com/scummvm/scummvm/commit/ddcfdf532927a3b31f0dd7033be5805fa38db15f
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2013-07-15T04:40:59-07:00

Commit Message:
GUI: Allow the event recorder dialog to be closed.

This is a regression from 6e4217e1ba1df9fd2ee4cd0d61151ed7dfc53021.

setResult does not automatically close the dialog. However,
Dialog::handleCommand will close the dialog when kCloseCmd is received.

Changed paths:
    gui/recorderdialog.cpp



diff --git a/gui/recorderdialog.cpp b/gui/recorderdialog.cpp
index a4c7428..1a11dba 100644
--- a/gui/recorderdialog.cpp
+++ b/gui/recorderdialog.cpp
@@ -191,7 +191,7 @@ void RecorderDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 dat
 		break;
 	case kCloseCmd:
 		setResult(kRecordDialogClose);
-		break;
+		// Fall through
 	default:
 		Dialog::handleCommand(sender, cmd, data);
 	}


Commit: 6a1112f98ff3739dde809275f1d09951b9a20ec6
    https://github.com/scummvm/scummvm/commit/6a1112f98ff3739dde809275f1d09951b9a20ec6
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2013-07-15T04:44:24-07:00

Commit Message:
GUI: Mark some intentional fall throughs in switches.

All of these are for handling kCloseCmd.

Changed paths:
    gui/chooser.cpp
    gui/saveload-dialog.cpp



diff --git a/gui/chooser.cpp b/gui/chooser.cpp
index 6ae0816..c195e94 100644
--- a/gui/chooser.cpp
+++ b/gui/chooser.cpp
@@ -67,6 +67,7 @@ void ChooserDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data
 		break;
 	case kCloseCmd:
 		setResult(-1);
+		// Fall through
 	default:
 		Dialog::handleCommand(sender, cmd, data);
 	}
diff --git a/gui/saveload-dialog.cpp b/gui/saveload-dialog.cpp
index c7dd62b..585117f 100644
--- a/gui/saveload-dialog.cpp
+++ b/gui/saveload-dialog.cpp
@@ -286,6 +286,7 @@ void SaveLoadChooserSimple::handleCommand(CommandSender *sender, uint32 cmd, uin
 		break;
 	case kCloseCmd:
 		setResult(-1);
+		// Fall through
 	default:
 		SaveLoadChooserDialog::handleCommand(sender, cmd, data);
 	}
@@ -595,6 +596,7 @@ void SaveLoadChooserGrid::handleCommand(CommandSender *sender, uint32 cmd, uint3
 
 	case kCloseCmd:
 		setResult(-1);
+		// Fall through
 	default:
 		SaveLoadChooserDialog::handleCommand(sender, cmd, data);
 	}