diff options
| author | Raphael Moll <ralf@android.com> | 2010-04-28 18:56:42 -0700 |
|---|---|---|
| committer | Raphael Moll <ralf@android.com> | 2010-04-28 18:56:42 -0700 |
| commit | bee5dcfbdb8907c2b8157d3b446cadc8c9a1f37f (patch) | |
| tree | 978720ff36b4ed6dfe1518bf039c1a896150e275 | |
| parent | 2f3041c9707ca3a196083318d299ba71ab9d5cce (diff) | |
| download | sdk-bee5dcfbdb8907c2b8157d3b446cadc8c9a1f37f.zip sdk-bee5dcfbdb8907c2b8157d3b446cadc8c9a1f37f.tar.gz sdk-bee5dcfbdb8907c2b8157d3b446cadc8c9a1f37f.tar.bz2 | |
Fix NPE when opening layout and target is still loading.
Change-Id: Ie4541646447669162ee303ef02d9bb81513e8e1e
| -rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/LayoutEditor.java | 5 |
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/LayoutEditor.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/LayoutEditor.java index c059a41..a250c76 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/LayoutEditor.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/LayoutEditor.java @@ -505,7 +505,10 @@ public class LayoutEditor extends AndroidEditor implements IShowEditorInput, IPa IAndroidTarget target = currentSdk.getTarget(project); if (target != null) { AndroidTargetData data = currentSdk.getTargetData(target); - desc = data.getLayoutDescriptors().getBaseViewDescriptor(); + if (data != null) { + // data can be null when the target is still loading + desc = data.getLayoutDescriptors().getBaseViewDescriptor(); + } } } |