Bug 583296 - Release timer resources after context menu. r=josh a=josh
authorBenoit Girard <b56girard@gmail.com>
Sun, 15 Aug 2010 23:48:51 -0400
changeset 50645 a9c461fb78e21ebaf38ea0886b84eab0233706d6
parent 50644 db51535791675578bec2b97a2ee345055b8da637
child 50646 9825a728b2cb340c34b663944f28725f61ef1531
push idunknown
push userunknown
push dateunknown
reviewersjosh, josh
bugs583296
milestone2.0b4pre
Bug 583296 - Release timer resources after context menu. r=josh a=josh
dom/plugins/PluginUtilsOSX.mm
--- a/dom/plugins/PluginUtilsOSX.mm
+++ b/dom/plugins/PluginUtilsOSX.mm
@@ -85,22 +85,22 @@ NPError mozilla::plugins::PluginUtilsOSX
   [[NSRunLoop currentRunLoop] addTimer:eventTimer 
                               forMode:NSEventTrackingRunLoopMode];
 
   NSMenu* nsmenu = reinterpret_cast<NSMenu*>(aMenu);
   NSPoint screen_point = ::NSMakePoint(aX, aY);
 
   [nsmenu popUpMenuPositioningItem:nil atLocation:screen_point inView:nil];
 
-  //[eventTimer invalidate];
-  //[eventProcessor release];
+  [eventTimer invalidate];
+  [eventProcessor release];
 
   return NPERR_NO_ERROR;
 
-  NS_OBJC_END_TRY_ABORT_BLOCK;
+  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(NPERR_GENERIC_ERROR);
 }
 
 void mozilla::plugins::PluginUtilsOSX::InvokeNativeEventLoop()
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
   ::CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0.0, true);
   NS_OBJC_END_TRY_ABORT_BLOCK;
 }