[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28512] trunk/blender/source/blender/ editors/space_file: [#22133] File Browser Mismatches File Name and Thumbnail

[Andrea Weikert]

Revision: 28512
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28512
Author:   elubie
Date:     2010-04-29 20:53:01 +0200 (Thu, 29 Apr 2010)

Log Message:
-----------
[#22133] File Browser Mismatches File Name and Thumbnail
* sorting of file list interfered with thumbnail order, stopping job while sorting now.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_file/filelist.c
    trunk/blender/source/blender/editors/space_file/space_file.c

Modified: trunk/blender/source/blender/editors/space_file/filelist.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/filelist.c	2010-04-29 18:46:43 UTC (rev 28511)
+++ trunk/blender/source/blender/editors/space_file/filelist.c	2010-04-29 18:53:01 UTC (rev 28512)
@@ -613,9 +613,7 @@
 	if (!imb)
 	{
 		if ( (filelist->filelist[fidx].flags & IMAGEFILE) || (filelist->filelist[fidx].flags & MOVIEFILE) ) {
-			char path[FILE_MAX];
-			BLI_join_dirfile(path, filelist->dir, filelist->filelist[fidx].relname);
-			imb = IMB_thumb_read(path, THB_NORMAL);
+			imb = IMB_thumb_read(filelist->filelist[fidx].path, THB_NORMAL);
 		} 
 		if (imb) {
 			filelist->filelist[fidx].image = imb;
@@ -1336,7 +1334,7 @@
 		if (!filelist->filelist[idx].image) {
 			if ( (filelist->filelist[idx].flags & IMAGEFILE) || (filelist->filelist[idx].flags & MOVIEFILE) ) {
 				FileImage* limg = MEM_callocN(sizeof(struct FileImage), "loadimage");
-				BLI_join_dirfile(limg->path, filelist->dir, filelist->filelist[idx].relname);
+				BLI_strncpy(limg->path, filelist->filelist[idx].path, FILE_MAX);
 				limg->index= idx;
 				limg->flags= filelist->filelist[idx].flags;
 				BLI_addtail(&tj->loadimages, limg);

Modified: trunk/blender/source/blender/editors/space_file/space_file.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/space_file.c	2010-04-29 18:46:43 UTC (rev 28511)
+++ trunk/blender/source/blender/editors/space_file/space_file.c	2010-04-29 18:53:01 UTC (rev 28512)
@@ -195,13 +195,24 @@
 	filelist_setfilter(sfile->files, params->flag & FILE_FILTER ? params->filter : 0);	
 	if (filelist_empty(sfile->files))
 	{
+		thumbnails_stop(sfile->files, C);
 		filelist_readdir(sfile->files);
+		if(params->sort!=FILE_SORT_NONE) {
+			filelist_sort(sfile->files, params->sort);
+		}
+		BLI_strncpy(params->dir, filelist_dir(sfile->files), FILE_MAX);
 		thumbnails_start(sfile->files, C);
-		BLI_strncpy(params->dir, filelist_dir(sfile->files), FILE_MAX);
 	} else {
 		filelist_filter(sfile->files);
+		if(params->sort!=FILE_SORT_NONE) {
+			thumbnails_stop(sfile->files, C);
+			filelist_sort(sfile->files, params->sort);
+			thumbnails_start(sfile->files, C);
+		} else {
+			filelist_filter(sfile->files);
+		}
+
 	}
-	if(params->sort!=FILE_SORT_NONE) filelist_sort(sfile->files, params->sort);		
 	
 	if (params->renamefile[0] != '\0') {
 		int idx = filelist_find(sfile->files, params->renamefile);