Ticket #16590: v1-0001-Main.shutdown-actually-remove-isHeadless-guards-a.patch

File v1-0001-Main.shutdown-actually-remove-isHeadless-guards-a.patch, 1.2 KB (added by ris, 8 years ago)

  • src/org/openstreetmap/josm/Main.java 

    From 90444ebd45b568a7a59f5a736759fa0cef8207e9 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sat, 11 Aug 2018 19:12:14 +0100
Subject: [PATCH v1] Main.shutdown(): *actually* remove isHeadless() guards
 around ImageProvider.shutdown(...)

---
 src/org/openstreetmap/josm/Main.java | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/org/openstreetmap/josm/Main.java b/src/org/openstreetmap/josm/Main.java
index 9be57a1f1..cec935004 100644
    a b public abstract class Main {  
    277277     * Shutdown JOSM.
    278278     */
    279279    protected void shutdown() {
    280         if (!GraphicsEnvironment.isHeadless()) {
    281             ImageProvider.shutdown(false);
    282         }
     280        ImageProvider.shutdown(false);
    283281        try {
    284282            pref.saveDefaults();
    285283        } catch (IOException | InvalidPathException ex) {
    286284            Logging.log(Logging.LEVEL_WARN, tr("Failed to save default preferences."), ex);
    287285        }
    288         if (!GraphicsEnvironment.isHeadless()) {
    289             ImageProvider.shutdown(true);
    290         }
     286        ImageProvider.shutdown(true);
    291287    }
    292288
    293289    /**