Skip to content

Commit

Permalink
Fix loading prefs from qz-tray.properties
Browse files Browse the repository at this point in the history
  • Loading branch information
tresf committed Aug 20, 2023
1 parent 045a9bc commit a1a2e7c
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion src/qz/utils/PrefsSearch.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import qz.installer.certificate.CertificateManager;
import qz.installer.certificate.KeyPairWrapper;

import java.util.Properties;

import static qz.installer.certificate.KeyPairWrapper.Type.CA;
import static qz.installer.certificate.KeyPairWrapper.Type.SSL;

/**
* Convenience class for searching for preferences on a user, app and <code>System.getProperty(...)</code> level
*/
Expand All @@ -19,7 +23,7 @@ private static String getProperty(String[] names, String defaultVal, boolean sea
// If none are provided, ensure we have some types of properties to iterate over
if(propArray.length == 0) {
if(appProps == null) {
appProps = CertificateManager.loadProperties();
appProps = CertificateManager.loadProperties(new KeyPairWrapper(SSL), new KeyPairWrapper(CA));
}
propArray = new Properties[]{ appProps };
}
Expand Down

0 comments on commit a1a2e7c

Please sign in to comment.