From 1fa08728dbfa8bd1db6b995337542ace4eb672e1 Mon Sep 17 00:00:00 2001
From: Zlatin Balevsky <zlatinb@gmail.com>
Date: Mon, 25 Oct 2021 23:12:06 +0100
Subject: [PATCH] convert the existing system-specific LnF to generic system

---
 gui/griffon-app/lifecycle/Initialize.groovy | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gui/griffon-app/lifecycle/Initialize.groovy b/gui/griffon-app/lifecycle/Initialize.groovy
index df0577fa..fe663343 100644
--- a/gui/griffon-app/lifecycle/Initialize.groovy
+++ b/gui/griffon-app/lifecycle/Initialize.groovy
@@ -71,6 +71,11 @@ class Initialize extends AbstractLifecycleHandler {
             guiPropsFile.withInputStream { props.load(it) }
             uiSettings = new UISettings(props)
 
+            if (LNFs.SYSTEM_ALIASES.contains(uiSettings.lnf)) {
+                log.info("converting user specified lnf from ${uiSettings.lnf} to system")
+                uiSettings.lnf = "system"
+            }
+            
             def lnf
             log.info("settting user-specified lnf $uiSettings.lnf")
             try {
@@ -79,6 +84,8 @@ class Initialize extends AbstractLifecycleHandler {
                 log.log(Level.WARNING,"couldn't set desired look and feel, switching to defaults", bad)
                 lnf = lookAndFeel("system","gtk","metal")
                 uiSettings.lnf = lnf.getID()
+                if(LNFs.SYSTEM_ALIASES.contains(uiSettings.lnf))
+                    uiSettings.lnf = "system"
             }
 
             if (uiSettings.font != null || uiSettings.autoFontSize || uiSettings.fontSize > 0 ) {