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/src/org/openstreetmap/josm/Main.java
+++ b/src/org/openstreetmap/josm/Main.java
@@ -277,17 +277,13 @@ public abstract class Main {
      * Shutdown JOSM.
      */
     protected void shutdown() {
-        if (!GraphicsEnvironment.isHeadless()) {
-            ImageProvider.shutdown(false);
-        }
+        ImageProvider.shutdown(false);
         try {
             pref.saveDefaults();
         } catch (IOException | InvalidPathException ex) {
             Logging.log(Logging.LEVEL_WARN, tr("Failed to save default preferences."), ex);
         }
-        if (!GraphicsEnvironment.isHeadless()) {
-            ImageProvider.shutdown(true);
-        }
+        ImageProvider.shutdown(true);
     }
 
     /**
-- 
2.11.0