Merge branch 'release-1.6.1' into main

# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Karl Tauber
2021-10-14 22:50:44 +02:00
3 changed files with 14 additions and 1 deletions

View File

@@ -44,6 +44,14 @@ FlatLaf Change Log
use same component for rendering and editing. (issue #385)
## 1.6.1
#### Fixed bugs
- Native window decorations: Catch `UnsatisfiedLinkError` when trying to load
`jawt.dll` to avoid an application crash (Java 8 on Windows 10 only).
## 1.6
#### New features and improvements

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
val releaseVersion = "1.6"
val releaseVersion = "1.6.1"
val developmentVersion = "2.0-SNAPSHOT"
version = if( java.lang.Boolean.getBoolean( "release" ) ) releaseVersion else developmentVersion

View File

@@ -96,6 +96,11 @@ class FlatWindowsNativeWindowBorder
// Java 9 and later does not have this problem.
try {
System.loadLibrary( "jawt" );
} catch( UnsatisfiedLinkError ex ) {
// log error only if native library jawt.dll not already loaded
String message = ex.getMessage();
if( message == null || !message.contains( "already loaded in another classloader" ) )
LoggingFacade.INSTANCE.logSevere( null, ex );
} catch( Exception ex ) {
LoggingFacade.INSTANCE.logSevere( null, ex );
}