MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

some additional checks for consistency

Browse Source
This commit is contained in:
Eugene Zhuravlev
2014-05-06 18:57:45 +04:00
parent 73c5925665
commit 2311a489bb
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/ant/src/com/intellij/lang/ant/config/execution/AntBuildMessageView.java
+10 -5
View File
@@ -597,16 +597,21 @@ public final class AntBuildMessageView extends JPanel implements DataProvider, O
return true;
}
AntBuildMessageView messageView = myContent.getUserData(KEY);
final AntBuildMessageView messageView = myContent.getUserData(KEY);
if (messageView.isStoppedOrTerminateRequested()) {
if (messageView == null || messageView.isStoppedOrTerminateRequested()) {
return true;
}
if (myCloseAllowed) return true;
if (myCloseAllowed) {
return true;
}
int result = Messages.showYesNoCancelDialog(AntBundle.message("ant.process.is.active.terminate.confirmation.text"),
AntBundle.message("close.ant.build.messages.dialog.title"), Messages.getQuestionIcon());
final int result = Messages.showYesNoCancelDialog(
AntBundle.message("ant.process.is.active.terminate.confirmation.text"),
AntBundle.message("close.ant.build.messages.dialog.title"), Messages.getQuestionIcon()
);
if (result == 0) { // yes
messageView.stopProcess();
myCloseAllowed = true;
plugins/ant/src/com/intellij/lang/ant/config/execution/OutputParser.java
+1 -1
View File
@@ -71,7 +71,7 @@ public class OutputParser{
}
public boolean isTerminateInvoked() {
return myProcessHandler.isProcessTerminating();
return myProcessHandler.isProcessTerminating() || myProcessHandler.isProcessTerminated();
}
protected Project getProject() {