Merge branch 'v0.19.x'

68003792 · Max Kellermann · 60f72f0f · ee026386 · 68003792
Commit 68003792 authored Oct 27, 2016 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

CompositeStorage.cxx src/storage/CompositeStorage.cxx +2 -1

No files found.
--- a/src/storage/CompositeStorage.cxx
+++ b/src/storage/CompositeStorage.cxx
@@ -287,7 +287,8 @@ CompositeStorage::GetInfo(const char *uri, bool follow, StorageFileInfo &info,
 		return true;
 	}

-	error.Set(composite_domain, "No such directory");
+	if (!error.IsDefined())
+		error.Set(composite_domain, "No such directory");
 	return false;
 }