Ticket #6909: 6909.patch

File 6909.patch, 1.3 KB (added by simon04, 13 years ago)

  • src/org/openstreetmap/josm/gui/MapFrame.java 

    diff --git a/src/org/openstreetmap/josm/gui/MapFrame.java b/src/org/openstreetmap/josm/gui/MapFrame.java
index b6019d2..266c31c 100644
    a b import org.openstreetmap.josm.actions.mapmode.MapMode;  
    4545import org.openstreetmap.josm.actions.mapmode.ParallelWayAction;
    4646import org.openstreetmap.josm.actions.mapmode.SelectAction;
    4747import org.openstreetmap.josm.actions.mapmode.ZoomAction;
     48import org.openstreetmap.josm.data.Preferences;
    4849import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
    4950import org.openstreetmap.josm.gui.dialogs.ChangesetDialog;
    5051import org.openstreetmap.josm.gui.dialogs.CommandStackDialog;
    … … public class MapFrame extends JPanel implements Destroyable, LayerChangeListener  
    196197        addToggleDialog(relationListDialog = new RelationListDialog());
    197198        addToggleDialog(new CommandStackDialog(this));
    198199        addToggleDialog(new UserListDialog());
    199         addToggleDialog(new HistoryDialog());
     200        if (Main.pref.getBoolean("dialog.history.enabled", false)) {
     201            addToggleDialog(new HistoryDialog());
     202        }
    200203        addToggleDialog(conflictDialog = new ConflictDialog());
    201204        addToggleDialog(validatorDialog = new ValidatorDialog());
    202205        addToggleDialog(filterDialog = new FilterDialog());