Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv18369/src
Modified Files:
Menus.cpp Project.cpp
Log Message:
Remove heavy-handed fix which caused some menu items not to be updated
correctly.
Add a different fix to stop OnUpdateUI re-entering.
Index: Project.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Project.cpp,v
retrieving revision 1.440
retrieving revision 1.441
diff -u -d -r1.440 -r1.441
--- Project.cpp 11 Jul 2009 18:05:28 -0000 1.440
+++ Project.cpp 14 Jul 2009 22:19:24 -0000 1.441
@@ -1643,6 +1643,9 @@
// This is done by only checking the wxClipboard contents during an idle
// event, thus preventing possible recursion during other event processing.
//
+ if (!mInIdle)
+ return;
+
mInIdle = true;
UpdateMenus();
Index: Menus.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Menus.cpp,v
retrieving revision 1.501
retrieving revision 1.502
diff -u -d -r1.501 -r1.502
--- Menus.cpp 14 Jul 2009 20:48:55 -0000 1.501
+++ Menus.cpp 14 Jul 2009 22:19:24 -0000 1.502
@@ -1493,14 +1493,6 @@
void AudacityProject::UpdateMenus()
{
- // DanH: We need to make sure this function isn't already executing before
- // we can continue safely.
- static bool bAlreadyUpdating = false;
- if (bAlreadyUpdating)
- return;
- else
- bAlreadyUpdating = true;
-
//ANSWER-ME: Why UpdateMenus only does active project?
//JKC: Is this test fixing a bug when multiple projects are open?
//so that menu states work even when different in different projects?
@@ -1536,7 +1528,6 @@
#endif
ModifyToolbarMenus();
- bAlreadyUpdating = false;
}
//
------------------------------------------------------------------------------
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time,
vendors submitting new applications to BlackBerry App World(TM) will have
the opportunity to enter the BlackBerry Developer Challenge. See full prize
details at: http://p.sf.net/sfu/Challenge
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
