blob: 6845651544d794769822a92989613130d1d8b3c0 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
commit 5e354b9
Author: Chris Coulson <chris.coulson@canonical.com>
Date: Thu Jan 5 11:19:50 2012 +1300
Bug 696030 - Use MonitorAutoLock rather than MonitorAutoEnter in nsGIOProtocolHandler r=karlt
--HG--
extra : rebase_source : 6f3d1a49a07affab679e41cd8cf968d62c072299
---
extensions/gio/nsGIOProtocolHandler.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git extensions/gio/nsGIOProtocolHandler.cpp extensions/gio/nsGIOProtocolHandler.cpp
index 9347b6e..e8f153d 100644
--- extensions/gio/nsGIOProtocolHandler.cpp
+++ extensions/gio/nsGIOProtocolHandler.cpp
@@ -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();
|
