From a76f0012dfebc9abdd51d81ab4fd81cb451d1ea3 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <rednoah@filebot.net>
Date: Mon, 23 Jul 2018 21:14:07 +0700
Subject: [PATCH] Refactor AUMID

---
 source/net/filebot/Main.java                         | 12 +-----------
 .../filebot/platform/windows/WinAppUtilities.java    | 10 +++++++---
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/source/net/filebot/Main.java b/source/net/filebot/Main.java
index a0871492..cd41bb11 100644
--- a/source/net/filebot/Main.java
+++ b/source/net/filebot/Main.java
@@ -121,11 +121,6 @@ public class Main {
 						configureLicense(f);
 						System.exit(0);
 					});
-
-					// set AUMID manually for legacy processes
-					if (isWindowsApp()) {
-						WinAppUtilities.setAppUserModelID(getApplicationName());
-					}
 				}
 
 				int status = new ArgumentProcessor().run(args);
@@ -256,13 +251,8 @@ public class Main {
 			});
 		} else if (isWindowsApp()) {
 			// Windows-specific configuration
-			WinAppUtilities.initializeApplication();
+			WinAppUtilities.initializeApplication(isUWP() ? null : getApplicationName());
 			frame.setIconImages(ResourceManager.getApplicationIconImages());
-
-			// set AUMID manually for legacy processes
-			if (!isUWP()) {
-				WinAppUtilities.setAppUserModelID(getApplicationName());
-			}
 		} else {
 			// generic Linux / FreeBSD / Solaris configuration
 			frame.setIconImages(ResourceManager.getApplicationIconImages());
diff --git a/source/net/filebot/platform/windows/WinAppUtilities.java b/source/net/filebot/platform/windows/WinAppUtilities.java
index 224fbbe5..99432300 100644
--- a/source/net/filebot/platform/windows/WinAppUtilities.java
+++ b/source/net/filebot/platform/windows/WinAppUtilities.java
@@ -15,9 +15,9 @@ import com.sun.jna.ptr.PointerByReference;
 
 public class WinAppUtilities {
 
-	public static void setAppUserModelID(String appID) {
+	public static void setAppUserModelID(String aumid) {
 		try {
-			Shell32.INSTANCE.SetCurrentProcessExplicitAppUserModelID(new WString(appID));
+			Shell32.INSTANCE.SetCurrentProcessExplicitAppUserModelID(new WString(aumid));
 		} catch (Throwable t) {
 			debug.log(Level.WARNING, t.getMessage(), t);
 		}
@@ -35,7 +35,11 @@ public class WinAppUtilities {
 		return null;
 	}
 
-	public static void initializeApplication() {
+	public static void initializeApplication(String aumid) {
+		if (aumid != null) {
+			setAppUserModelID(aumid);
+		}
+
 		// improved UI defaults
 		UIManager.put("TitledBorder.border", createCompoundBorder(createLineBorder(new Color(0xD7D7D7), 1, true), createCompoundBorder(createMatteBorder(6, 5, 6, 5, new Color(0xE5E5E5)), createEmptyBorder(0, 2, 0, 2))));
 	}