Commit bafce9bf authored by Chris Coulson's avatar Chris Coulson
Browse files

Bug 696030 - Use MonitorAutoLock rather than MonitorAutoEnter in nsGIOProtocolHandler r=karlt 

--HG--
extra : rebase_source : 6f3d1a49a07affab679e41cd8cf968d62c072299
parent 0d9e8e8e

extensions/gio/nsGIOProtocolHandler.cpp

+2 −2
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ class nsGIOInputStream : public nsIInputStream 
void

nsGIOInputStream::SetMountResult(MountOperationResult result, gint error_code)

{

  mozilla::MonitorAutoEnter mon(mMonitorMountInProgress);

  mozilla::MonitorAutoLock mon(mMonitorMountInProgress);

  mMountRes = result;

  mMountErrorCode = error_code;

  mon.Notify();
@@ -263,7 +263,7 @@ nsGIOInputStream::MountVolume() { 
                                NULL,

                                mount_enclosing_volume_finished,

                                this);

  mozilla::MonitorAutoEnter mon(mMonitorMountInProgress);

  mozilla::MonitorAutoLock mon(mMonitorMountInProgress);

  /* Waiting for finish of mount operation thread */  

  while (mMountRes == MOUNT_OPERATION_IN_PROGRESS)

    mon.Wait();