Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9415/src

Modified Files:
        Menus.cpp 
Log Message:
I believe this fixes "P2 (Linux only) Crash undoing a label edit, or repeatedly
undoing/redoing addition of a label."

Now the AudacityProject::UpdateMenus function checks to make sure it is not
being re-entered, as that seems to cause all sorts of weird problems.



Index: Menus.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Menus.cpp,v
retrieving revision 1.500
retrieving revision 1.501
diff -u -d -r1.500 -r1.501
--- Menus.cpp   13 Jul 2009 09:13:11 -0000      1.500
+++ Menus.cpp   14 Jul 2009 20:48:55 -0000      1.501
@@ -1493,6 +1493,14 @@
 
 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?
@@ -1528,6 +1536,7 @@
 #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

Reply via email to