diff options
| -rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationComposite.java | 9 |
1 files changed, 6 insertions, 3 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 89285bf..4b1d5f6 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 @@ -189,9 +189,12 @@ public class ConfigurationComposite extends Composite { sb.append(configName); sb.append(SEP); if (locale != null) { - sb.append(((LanguageQualifier) locale[0]).getValue()); - sb.append(SEP_LOCALE); - sb.append(((RegionQualifier) locale[1]).getValue()); + if (locale[0] != null && locale[1] != null) { + // locale[0]/[1] can be null sometimes when starting Eclipse + sb.append(((LanguageQualifier) locale[0]).getValue()); + sb.append(SEP_LOCALE); + sb.append(((RegionQualifier) locale[1]).getValue()); + } } sb.append(SEP); sb.append(theme); |