From 1c5dfc46a05651025b8aa1e13b6c5353ff30c0fe Mon Sep 17 00:00:00 2001
From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com.>
Date: Wed, 11 Dec 2024 23:13:23 +0000
Subject: [PATCH] fixes

---
 build.gradle                                  |  1 +
 .../software/SPDF/SPdfApplication.java        | 33 +++++++++++--------
 .../software/SPDF/UI/impl/LoadingWindow.java  |  1 -
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6034b9f9..b6e2166d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -91,6 +91,7 @@ launch4j {
     icon = "${projectDir}/src/main/resources/static/favicon.ico"
 
     outfile="Stirling-PDF.exe"
+    
     if(System.getenv("STIRLING_PDF_DESKTOP_UI") == 'true') {
     	headerType = "gui"
     } else {
diff --git a/src/main/java/stirling/software/SPDF/SPdfApplication.java b/src/main/java/stirling/software/SPDF/SPdfApplication.java
index 2258bb05..f39c0e18 100644
--- a/src/main/java/stirling/software/SPDF/SPdfApplication.java
+++ b/src/main/java/stirling/software/SPDF/SPdfApplication.java
@@ -75,19 +75,17 @@ public class SPdfApplication {
 
     public static void main(String[] args) throws IOException, InterruptedException {
 
-        
-
         SpringApplication app = new SpringApplication(SPdfApplication.class);
-        
+
         Properties props = new Properties();
-        
-        if("true".equals(System.getenv("STIRLING_PDF_DESKTOP_UI"))) {
-	        System.setProperty("java.awt.headless", "false");
-	        app.setHeadless(false);
-	        props.put("java.awt.headless", "false");
-	        props.put("spring.main.web-application-type", "servlet");
+
+        if ("true".equals(System.getenv("STIRLING_PDF_DESKTOP_UI"))) {
+            System.setProperty("java.awt.headless", "false");
+            app.setHeadless(false);
+            //            props.put("java.awt.headless", "false");
+            //            props.put("spring.main.web-application-type", "servlet");
         }
-        
+
         app.setAdditionalProfiles("default");
         app.addInitializers(new ConfigInitializer());
         Map<String, String> propertyFiles = new HashMap<>();
@@ -112,10 +110,17 @@ public class SPdfApplication {
             logger.warn("Custom configuration file 'configs/custom_settings.yml' does not exist.");
         }
         Properties finalProps = new Properties();
-        finalProps.putAll(Collections.singletonMap(
-                "spring.config.additional-location",
-                propertyFiles.get("spring.config.additional-location")));
-        finalProps.putAll(props);
+
+        if (!propertyFiles.isEmpty()) {
+            finalProps.putAll(
+                    Collections.singletonMap(
+                            "spring.config.additional-location",
+                            propertyFiles.get("spring.config.additional-location")));
+        }
+
+        if (props.isEmpty()) {
+            finalProps.putAll(props);
+        }
         app.setDefaultProperties(finalProps);
 
         app.run(args);
diff --git a/src/main/java/stirling/software/SPDF/UI/impl/LoadingWindow.java b/src/main/java/stirling/software/SPDF/UI/impl/LoadingWindow.java
index 87b253f8..ad827dc5 100644
--- a/src/main/java/stirling/software/SPDF/UI/impl/LoadingWindow.java
+++ b/src/main/java/stirling/software/SPDF/UI/impl/LoadingWindow.java
@@ -90,7 +90,6 @@ public class LoadingWindow extends JDialog {
                     try {
                         progressBar.setValue(Math.min(Math.max(progress, 0), 100));
                         progressBar.setString(progress + "%");
-                        log.info(progress + "%");
                         mainPanel.revalidate();
                         mainPanel.repaint();
                     } catch (Exception e) {