projects
/
geeqie.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
900e65e
11b6ce5
)
Merge remote-tracking branch 'origin/merge-requests/5'
author
Klaus Ethgen
<Klaus@Ethgen.de>
Sun, 20 Jul 2014 12:54:56 +0000
(13:54 +0100)
committer
Klaus Ethgen
<Klaus@Ethgen.de>
Sun, 20 Jul 2014 12:54:56 +0000
(13:54 +0100)
* 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.
1
2
src/filedata.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/filedata.c
index
15e2017
,
9478cf8
..
9c2ac8c
---
1
/
src/filedata.c
---
2
/
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);
- file_data_ref(fd);
+ if (!fd) fd = file_data_new(path_utf8, &st, TRUE);
+ if (fd)
+ {
+ file_data_ref(fd);
+ }
filelist_free(files);
g_free(dir);