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

do not ask for restarting ddms if it is corrupted

Browse Source
This commit is contained in:
Eugene Kudelevsky
2011-03-28 20:32:46 +04:00
parent ca05ee0570
commit 17e7380fd5
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android/src/org/jetbrains/android/run/AndroidRunConfigurationBase.java
+13 -9
View File
@@ -277,19 +277,23 @@ public abstract class AndroidRunConfigurationBase extends ModuleBasedConfigurati
}
private static boolean activateDdmsIfNeccessary(@NotNull AndroidFacet facet) {
Project project = facet.getModule().getProject();
boolean ddmsEnabled = AndroidEnableDdmsAction.isDdmsEnabled();
final Project project = facet.getModule().getProject();
final boolean ddmsEnabled = AndroidEnableDdmsAction.isDdmsEnabled();
boolean shouldRestartDdms = !ddmsEnabled;
if (ddmsEnabled && isDdmsCorrupted(facet)) {
ddmsEnabled = false;
shouldRestartDdms = true;
AndroidEnableDdmsAction.setDdmsEnabled(project, false);
}
if (!ddmsEnabled) {
int result = Messages.showYesNoDialog(project, AndroidBundle.message("android.ddms.disabled.error"),
AndroidBundle.message("android.ddms.disabled.dialog.title"),
Messages.getQuestionIcon());
if (result != 0) {
return false;
if (shouldRestartDdms) {
if (!ddmsEnabled) {
int result = Messages.showYesNoDialog(project, AndroidBundle.message("android.ddms.disabled.error"),
AndroidBundle.message("android.ddms.disabled.dialog.title"),
Messages.getQuestionIcon());
if (result != 0) {
return false;
}
}
AndroidEnableDdmsAction.setDdmsEnabled(project, true);
}