From: Klaus Ethgen <Klaus@Ethgen.de>
Date: Sun, 20 Jul 2014 12:54:56 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/merge-requests/5'
X-Git-Tag: v1.2~2
X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=e79d3547fb650e5f45cb9c30707724c221fdfc20

Merge remote-tracking branch 'origin/merge-requests/5'

* origin/merge-requests/5:
  Fix crash when loading collection listing inexistent files.

This is now a combination of Leons patch 900e65e and merge request of
Laurent. Hopefully that is now a bit more stable.
---

e79d3547fb650e5f45cb9c30707724c221fdfc20
diff --cc src/filedata.c
index 15e20173,9478cf86..9c2ac8c2
--- a/src/filedata.c
+++ b/src/filedata.c
@@@ -1150,8 -1150,10 +1150,11 @@@ FileData *file_data_new_group(const gch
  	filelist_read_real(dir, &files, NULL, TRUE);
  
  	fd = g_hash_table_lookup(file_data_pool, path_utf8);
 +	if (!fd) fd = file_data_new(path_utf8, &st, TRUE);
- 	file_data_ref(fd);
+ 	if (fd)
+ 		{
+ 		file_data_ref(fd);
+ 		}
  
  	filelist_free(files);
  	g_free(dir);