moving rollover check, was causing hangs upon termination in case ->top was 0

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20353 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/macnotfy.cpp b/src/mac/carbon/macnotfy.cpp
index 36d7fb3e614bfa2c7c8d62471120b8ae31476e8d..65e43775982084403b50b5f54d485ffd425345e7 100644 (file)
--- a/src/mac/carbon/macnotfy.cpp
+++ b/src/mac/carbon/macnotfy.cpp
@@ -112,11 +112,11 @@ void wxMacRemoveAllNotifiersForData( wxMacNotifierTableRef table , void* data )
     
     while ( e->top != index )
     {
     
     while ( e->top != index )
     {

-        if ( index == kMaxEvents )
-            index = 0 ;

         if ( e->data[index] == data )
             e->data[index] = NULL ;
         index++ ;
         if ( e->data[index] == data )
             e->data[index] = NULL ;
         index++ ;

+        if ( index == kMaxEvents )
+            index = 0 ;

     }
 }
 
     }
 }
 

diff --git a/src/mac/macnotfy.cpp b/src/mac/macnotfy.cpp
index 36d7fb3e614bfa2c7c8d62471120b8ae31476e8d..65e43775982084403b50b5f54d485ffd425345e7 100644 (file)
--- a/src/mac/macnotfy.cpp
+++ b/src/mac/macnotfy.cpp
@@ -112,11 +112,11 @@ void wxMacRemoveAllNotifiersForData( wxMacNotifierTableRef table , void* data )
     
     while ( e->top != index )
     {
     
     while ( e->top != index )
     {

-        if ( index == kMaxEvents )
-            index = 0 ;

         if ( e->data[index] == data )
             e->data[index] = NULL ;
         index++ ;
         if ( e->data[index] == data )
             e->data[index] = NULL ;
         index++ ;

+        if ( index == kMaxEvents )
+            index = 0 ;

     }
 }
 
     }
 }