aboutsummaryrefslogtreecommitdiffstats
path: root/eclipse/plugins/com.android.ide.eclipse.adt
diff options
context:
space:
mode:
authorRaphael <raphael@google.com>2010-03-02 15:00:56 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-03-02 15:00:56 -0800
commit069746b79c88c2ebb5acae5796477229fc8fed94 (patch)
tree095f579751b55924fb0c808de32216ef8e6000d5 /eclipse/plugins/com.android.ide.eclipse.adt
parentd0d0fe4e7b846ba41bcfe99f25bb9d9e951185be (diff)
parent9ce7e25b0e7df81164f44c7068967393487338b2 (diff)
downloadsdk-069746b79c88c2ebb5acae5796477229fc8fed94.zip
sdk-069746b79c88c2ebb5acae5796477229fc8fed94.tar.gz
sdk-069746b79c88c2ebb5acae5796477229fc8fed94.tar.bz2
Merge "ADT: GLE ConfigComposite crashes when target==null"
Diffstat (limited to 'eclipse/plugins/com.android.ide.eclipse.adt')
-rw-r--r--eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationComposite.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationComposite.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationComposite.java
index 85427a9..dc82397 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationComposite.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationComposite.java
@@ -393,7 +393,10 @@ public class ConfigurationComposite extends Composite {
mTarget = currentSdk.getTarget(iProject);
}
- LoadStatus targetStatus = Sdk.getCurrent().checkAndLoadTargetData(mTarget, null);
+ LoadStatus targetStatus = LoadStatus.FAILED;
+ if (mTarget != null) {
+ targetStatus = Sdk.getCurrent().checkAndLoadTargetData(mTarget, null);
+ }
if (targetStatus == LoadStatus.LOADED) {
mResources = ResourceManager.getInstance().getProjectResources(iProject);