input/Open: use ScopeLock

3143dbf3 · Max Kellermann · 38d587aa · 3143dbf3
Commit 3143dbf3 authored Sep 09, 2016 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

Open.cxx src/input/Open.cxx +7 -4

No files found.
--- a/src/input/Open.cxx
+++ b/src/input/Open.cxx
@@ -67,10 +67,13 @@ InputStream::OpenReady(const char *uri,
 	if (is == nullptr)
 		return nullptr;

-	mutex.lock();
-	is->WaitReady();
-	bool success = is->Check(error);
-	mutex.unlock();
+	bool success;
+
+	{
+		const ScopeLock protect(mutex);
+		is->WaitReady();
+		success = is->Check(error);
+	}

 	if (!success)
 		is.reset();