X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=blobdiff_plain;f=src%2Fui_fileops.c;h=c614e9678ab51e782f4746e76db666606203aa0b;hp=714efc89bf67fd824e11af4f9b6ec7a3b64e9d6e;hb=e08195b8e7b501010fbed20bb45363d38bb7e338;hpb=e498f547a95eda6d860c75ec058e145521af045e

diff --git a/src/ui_fileops.c b/src/ui_fileops.c
index 714efc89..c614e967 100644
--- a/src/ui_fileops.c
+++ b/src/ui_fileops.c
@@ -757,8 +757,13 @@ gboolean file_extension_match(const gchar *path, const gchar *ext)
 
 gchar *remove_extension_from_path(const gchar *path)
 {
+	const gchar *reg_ext;
+
 	if (!path) return NULL;
-	return g_strndup(path, strlen(path)-strlen(registered_extension_from_path(path)));
+
+	reg_ext = registered_extension_from_path(path);
+
+	return g_strndup(path, strlen(path) - (reg_ext == NULL ? 0 : strlen(reg_ext)));
 }
 
 void parse_out_relatives(gchar *path)