1 files changed, 16 insertions, 7 deletions

diff --git a/lib/wx/c_src/wxe_impl.cpp b/lib/wx/c_src/wxe_impl.cpp
index 05d56667ab..7817e7fa8a 100644
--- a/lib/wx/c_src/wxe_impl.cpp
+++ b/lib/wx/c_src/wxe_impl.cpp
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2008-2016. All Rights Reserved.
+ * Copyright Ericsson AB 2008-2017. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -267,6 +267,8 @@ int WxeApp::dispatch_cmds()
   return more;
 }
 
+#define BREAK_BATCH 200
+
 int WxeApp::dispatch(wxeFifo * batch)
 {
   int ping = 0;
@@ -279,7 +281,11 @@ int WxeApp::dispatch(wxeFifo * batch)
       erl_drv_mutex_unlock(wxe_batch_locker_m);
       switch(event->op) {
       case WXE_BATCH_END:
-	if(blevel>0) blevel--;
+	if(blevel>0) {
+          blevel--;
+          if(blevel==0)
+            wait += BREAK_BATCH*100;
+        }
 	break;
       case WXE_BATCH_BEGIN:
 	blevel++;
@@ -311,10 +317,13 @@ int WxeApp::dispatch(wxeFifo * batch)
       erl_drv_mutex_lock(wxe_batch_locker_m);
       batch->Cleanup();
     }
-    if(blevel <= 0 || wait > 3) {
+    if(blevel <= 0 || wait > BREAK_BATCH) {
       erl_drv_mutex_unlock(wxe_batch_locker_m);
-      if(blevel > 0) return 1; // We are still in a batch but we can let wx check for events
-      else return 0;
+      if(blevel > 0) {
+        return 1; // We are still in a batch but we can let wx check for events
+      } else {
+        return 0;
+      }
     }
     // sleep until something happens
     // fprintf(stderr, "%s:%d sleep %d %d %d\r\n", __FILE__, __LINE__, batch->m_n, blevel, wait);fflush(stderr);
@@ -672,7 +681,7 @@ void * WxeApp::getPtr(char * bp, wxeMemEnv *memenv) {
     throw wxe_badarg(index);
   }
   void * temp = memenv->ref2ptr[index];
-  if((index < memenv->next) && ((index == 0) || (temp > NULL)))
+  if((index < memenv->next) && ((index == 0) || (temp != (void *)NULL)))
     return temp;
   else {
     throw wxe_badarg(index);
@@ -684,7 +693,7 @@ void WxeApp::registerPid(char * bp, ErlDrvTermData pid, wxeMemEnv * memenv) {
   if(!memenv)
     throw wxe_badarg(index);
   void * temp = memenv->ref2ptr[index];
-  if((index < memenv->next) && ((index == 0) || (temp > NULL))) {
+  if((index < memenv->next) && ((index == 0) || (temp != (void *) NULL))) {
     ptrMap::iterator it;
     it = ptr2ref.find(temp);
     if(it != ptr2ref.end()) {