Commit 3a07f3ea authored by Kristof Szabados's avatar Kristof Szabados
Browse files

selecting the cancel button on the exeuction dialog should not shut down the...


selecting the cancel button on the exeuction dialog should not shut down the main controller or execute something randomly, but instead step back and let the user decide what to do next.
Signed-off-by: Kristof Szabados's avatarKristof Szabados <Kristof.Szabados@ericsson.com>
parent 76a8a73f
......@@ -716,8 +716,7 @@ public class NativeJavaExecutor extends BaseExecutor {
dialog.setSelection(lastTimeSelection, lastTimeSelectionTime, lastTimeSelectionType);
if (dialog.open() != Window.OK) {
executionStarted = false;
shutdownSession();
lastTimeSelectionType = ExecutableType.NONE;
return;
}
......@@ -773,10 +772,15 @@ public class NativeJavaExecutor extends BaseExecutor {
executedTests.ensureCapacity(executedTests.size() + lastTimeSelectionTime);
break;
default:
invalidSelection = false;
break;
}
} while (invalidSelection);
if (lastTimeSelectionType == ExecutableType.NONE) {
return;
}
executionStarted = true;
executeRequested = true;
final MainController.mcStateEnum state = mainController.get_state();
......
......@@ -679,8 +679,7 @@ public final class JniExecutor extends BaseExecutor implements IJNICallback {
dialog.setSelection(lastTimeSelection, lastTimeSelectionTime, lastTimeSelectionType);
if (dialog.open() != Window.OK) {
executionStarted = false;
shutdownSession();
lastTimeSelectionType = ExecutableType.NONE;
return;
}
......@@ -736,10 +735,15 @@ public final class JniExecutor extends BaseExecutor implements IJNICallback {
executedTests.ensureCapacity(executedTests.size() + lastTimeSelectionTime);
break;
default:
invalidSelection = false;
break;
}
} while (invalidSelection);
if (lastTimeSelectionType == ExecutableType.NONE) {
return;
}
executionStarted = true;
executeRequested = true;
if (MC_READY == jnimw.get_state().getValue()) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment