Merge branch 'v0.16.x'

Conflicts:
	src/output/osx_plugin.c
	src/text_input_stream.c

1 files changed, 2 insertions, 2 deletions

diff --git a/src/uri.c b/src/uri.c
index 21a849f8..2a0ca6ca 100644
--- a/src/uri.c
+++ b/src/uri.c
@@ -34,13 +34,13 @@ bool uri_has_scheme(const char *uri)
 const char *
 uri_get_suffix(const char *uri)
 {
-	const char *suffix = strrchr(g_basename(uri), '.');
+	const char *suffix = strrchr(uri, '.');
 	if (suffix == NULL)
 		return NULL;
 
 	++suffix;
 
-	if (strchr(suffix, '/') != NULL)
+	if (strpbrk(suffix, "/\\") != NULL)
 		return NULL;
 
 	return suffix;