don't reset idle tag unless idle function is also going to be removed

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

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 9be1cb13bff17db548db6d73715b6b3795d6a662..3f6f2920c5a4b3a79073360ae7c7a577231512d5 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -224,16 +224,6 @@ static gint wxapp_idle_callback( gpointer WXUNUSED(data) )
     // thread so we must lock it here ourselves.
     gdk_threads_enter();
 
     // thread so we must lock it here ourselves.
     gdk_threads_enter();
 

-    // Indicate that we are now in idle mode and event handlers
-    // will have to reinstall the idle handler again.
-    {
-#if wxUSE_THREADS
-        wxMutexLocker lock(gs_idleTagsMutex);
-#endif
-        g_isIdle = true;
-        wxTheApp->m_idleTag = 0;
-    }
-

     bool moreIdles;
 
     // Send idle event to all who request them as long as
     bool moreIdles;
 
     // Send idle event to all who request them as long as


@@ -245,7 +235,17 @@ static gint wxapp_idle_callback( gpointer WXUNUSED(data) )
     gdk_threads_leave();
 
     if (!moreIdles)
     gdk_threads_leave();
 
     if (!moreIdles)

+    {
+#if wxUSE_THREADS
+        wxMutexLocker lock(gs_idleTagsMutex);
+#endif
+        // Indicate that we are now in idle mode and event handlers
+        // will have to reinstall the idle handler again.
+        g_isIdle = true;
+        wxTheApp->m_idleTag = 0;
+

         wxAddEmissionHook();
         wxAddEmissionHook();

+    }

 
     // Return FALSE if no more idle events are to be sent
     return moreIdles;
 
     // Return FALSE if no more idle events are to be sent
     return moreIdles;