Skip to content

Commit

Permalink
Fixed regression in BrowserComponent caused by async loading of nativ…
Browse files Browse the repository at this point in the history
…e peer. Fixed issue in invokeWithoutBlocking also that caused it to be unnecessarily turned off inside processSerialCalls.
  • Loading branch information
shannah committed Dec 13, 2019
1 parent 6ba6314 commit c300fe1
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
11 changes: 10 additions & 1 deletion CodenameOne/src/com/codename1/ui/BrowserComponent.java
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,16 @@ public static boolean isNativeBrowserSupported() {
* @param key see the documentation with the CodenameOne Implementation for further details
* @param value see the documentation with the CodenameOne Implementation for further details
*/
public void setProperty(String key, Object value) {
public void setProperty(final String key, final Object value) {
if (internal == null) {

onReady(new Runnable() {
public void run() {
setProperty(key, value);
}
});
return;
}
Display.impl.setBrowserProperty(internal, key, value);
}

Expand Down
1 change: 0 additions & 1 deletion CodenameOne/src/com/codename1/ui/Display.java
Original file line number Diff line number Diff line change
Expand Up @@ -1274,7 +1274,6 @@ public void run() {
* Used by the EDT to process all the calls submitted via call serially
*/
void processSerialCalls() {
disableInvokeAndBlock = false;
processingSerialCalls = true;
int size = pendingSerialCalls.size();
if(size > 0) {
Expand Down

0 comments on commit c300fe1

Please sign in to comment.