Index: /trunk/src/org/openstreetmap/josm/actions/relation/EditRelationAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/relation/EditRelationAction.java (revision 7917) +++ /trunk/src/org/openstreetmap/josm/actions/relation/EditRelationAction.java (revision 7918) @@ -21,5 +21,5 @@ /** - * The action for editing a relation + * The action for editing a relation. * @since 5793 */ @@ -36,5 +36,5 @@ /** - * Returns the set of currently selected relation members for the given relation. + * Returns the set of currently selected relation members for the given relation. * @param r The relation to inspect * @return The set of currently selected relation members for the given relation. @@ -61,5 +61,5 @@ */ public static void launchEditor(Relation toEdit) { - if (toEdit == null || !Main.isDisplayingMapView()) return; + if (toEdit == null || toEdit.isDeleted() || !Main.isDisplayingMapView()) return; RelationEditor.getEditor(Main.main.getEditLayer(), toEdit, getMembersForCurrentSelection(toEdit)).setVisible(true); @@ -71,8 +71,8 @@ if (relations.size() > Main.pref.getInteger("warn.open.maxrelations", 5) && /* I18N english text for value 1 makes no real sense, never called for values <= maxrel (usually 5) */ - JOptionPane.OK_OPTION != JOptionPane.showConfirmDialog(Main.parent, + JOptionPane.OK_OPTION != JOptionPane.showConfirmDialog(Main.parent, ""+trn("You are about to open {0} different relation editor simultaneously.
Do you want to continue?", "You are about to open {0} different relation editors simultaneously.
Do you want to continue?", - relations.size(), relations.size())+"", + relations.size(), relations.size())+"", tr("Confirmation"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE)) { return; @@ -85,5 +85,12 @@ @Override protected void updateEnabledState() { - setEnabled( !relations.isEmpty() ); + boolean enabled = false; + for (Relation r : relations) { + if (!r.isDeleted()) { + enabled = true; + break; + } + } + setEnabled(enabled); } }