liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit for issue 294 applied on behalf of Steve Herrell

Browse Source
This commit is contained in:
Wyatt Olson
2010-11-04 17:49:50 -06:00
parent fd52ce278c
commit 37b16e504f
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtgui/filecatalog.cc
View File

@@ -312,8 +312,10 @@ int refreshpb (void* data) {
} }
void FileCatalog::previewReady (int dir_id, FileBrowserEntry* fdn) { void FileCatalog::previewReady (int dir_id, FileBrowserEntry* fdn) {
GThreadLock lock; GThreadLock lock;
_previewReady (dir_id,fdn);
}
void FileCatalog::_previewReady (int dir_id, FileBrowserEntry* fdn) {
if ( dir_id != selectedDirectoryId ) if ( dir_id != selectedDirectoryId )
{ {
@@ -803,7 +805,7 @@ void FileCatalog::addAndOpenFile (const Glib::ustring& fname) {
Thumbnail* tmb = cacheMgr->getEntry (file->get_parse_name()); Thumbnail* tmb = cacheMgr->getEntry (file->get_parse_name());
if (tmb) { if (tmb) {
FileBrowserEntry* entry = new FileBrowserEntry (tmb, file->get_parse_name()); FileBrowserEntry* entry = new FileBrowserEntry (tmb, file->get_parse_name());
previewReady (selectedDirectoryId,entry); _previewReady (selectedDirectoryId,entry);
// open the file // open the file
FCOIParams* params = new FCOIParams; FCOIParams* params = new FCOIParams;
params->catalog = this; params->catalog = this;

1
rtgui/filecatalog.h
View File

@@ -134,6 +134,7 @@ class FileCatalog : public Gtk::VBox,
void refreshEditedState (const std::set<Glib::ustring>& efiles); void refreshEditedState (const std::set<Glib::ustring>& efiles);
// previewloaderlistener interface // previewloaderlistener interface
void _previewReady (int dir_id, FileBrowserEntry* fdn);
void previewReady (int dir_id, FileBrowserEntry* fdn); void previewReady (int dir_id, FileBrowserEntry* fdn);
void previewsFinished (int dir_id); void previewsFinished (int dir_id);
void _previewsFinished (); void _previewsFinished ();