From 49a7812d457d0d477779420983199ede7b355e1e Mon Sep 17 00:00:00 2001 From: Thys ten Veldhuis Date: Tue, 7 Jan 2020 16:11:58 +0100 Subject: [PATCH] #2 Clear any exceptions when retrieving Java field ids (ignore them for now). --- .../resources/lib/libJTouchBarJavaFX.dylib | Bin 33184 -> 33328 bytes .../Bridged/JNI/JTouchBarJavaFXJNI.cpp | 1 + 2 files changed, 1 insertion(+) diff --git a/src/debug/resources/lib/libJTouchBarJavaFX.dylib b/src/debug/resources/lib/libJTouchBarJavaFX.dylib index 6f9980c11a3cdfd0bb9fb2c175c9f2333e6475ef..7c50e1c966af3c051d3a0ffd048cf4450f8f3661 100755 GIT binary patch delta 782 zcmXw$e@IhN6vyv&8fl^3F$V$po3Zo$VL+jq{?ZWrm_xW<}Ip^Iw*vE`r zWD@GW*rE;eH7y=B6Ur{lJy@^0%k( z(!3p(%s1gMXDaTecHb-0v55pIoFCtU6lcRRb&;Dcz%rz(tc8jWVcCGtp!&0F*2HD% z5Q~(0QoXKA7WiddAS`Ft0DKi{w~gN3*iH%}Otg!H{6CkF`D-YHDAt!wYB$lKxs%XM zT!Et}5$e=j0mj98QP$kPdDdlZ~+thTIXX7SueXz#grK{$nj zEi54~OF%4C@I@x1lJui94jDvl{n(mRLGziG2iUsxTuo{Uy@$1cqk K?@>(+iRS-M6~wXt delta 679 zcmdnc!nB~7X+no!gBSxCgmOUWhK)1DnVA*@PTs^kNz)Q2)?>oJV8F`2zzt*vK-4e* zg}|5zNSgsM^W=kU(ySFgVb;kH8HFb=VBrvO)SA9#KbNu2l>IB)B;&abZr;K2gOTk3 z(8vewn++9C@lQ?=vt#6)yh2QwQ;%Q11#I->(_*tGw~AXa?wx!2p`pIu2dLMrp`srq7Xn2C#KA6MNP&t5Ox|dyKUu+ugRyzC zrjb44naP<(_Do-xCa*HGV^p8~5-1cnS<~2_v2$`JkX$l(rLleeEoKG=ImQMCm=(+{ z5I)RsB`E)cB*Zc=DBnN|!mow$8=(BI)+JrCx;lITa%N>+9M638MU6K0NWM0$i$qCj93SM>I oT+`%NJU=E9@zKI4z`JwDoB#j- diff --git a/src/main/objective-c++/Bridged/JNI/JTouchBarJavaFXJNI.cpp b/src/main/objective-c++/Bridged/JNI/JTouchBarJavaFXJNI.cpp index 2d5773b..7ca8b5d 100644 --- a/src/main/objective-c++/Bridged/JNI/JTouchBarJavaFXJNI.cpp +++ b/src/main/objective-c++/Bridged/JNI/JTouchBarJavaFXJNI.cpp @@ -16,6 +16,7 @@ jfieldID GetFieldIDSafe(JNIEnv* env, jclass cls, const char* name, const char* sig) { jfieldID fieldId = env->GetFieldID(cls, name, sig); if(env->ExceptionCheck()) { + env->ExceptionClear(); return nullptr; }