From 37b16e504f8cc13fd9b577fc56436205c321c2d7 Mon Sep 17 00:00:00 2001 From: Wyatt Olson Date: Thu, 4 Nov 2010 17:49:50 -0600 Subject: [PATCH] Commit for issue 294 applied on behalf of Steve Herrell --- rtgui/filecatalog.cc | 8 +++++--- rtgui/filecatalog.h | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rtgui/filecatalog.cc b/rtgui/filecatalog.cc index 26866cee4..65fdf7e0a 100644 --- a/rtgui/filecatalog.cc +++ b/rtgui/filecatalog.cc @@ -312,9 +312,11 @@ int refreshpb (void* data) { } void FileCatalog::previewReady (int dir_id, FileBrowserEntry* fdn) { - GThreadLock lock; - + _previewReady (dir_id,fdn); +} +void FileCatalog::_previewReady (int dir_id, FileBrowserEntry* fdn) { + if ( dir_id != selectedDirectoryId ) { return; @@ -803,7 +805,7 @@ void FileCatalog::addAndOpenFile (const Glib::ustring& fname) { Thumbnail* tmb = cacheMgr->getEntry (file->get_parse_name()); if (tmb) { FileBrowserEntry* entry = new FileBrowserEntry (tmb, file->get_parse_name()); - previewReady (selectedDirectoryId,entry); + _previewReady (selectedDirectoryId,entry); // open the file FCOIParams* params = new FCOIParams; params->catalog = this; diff --git a/rtgui/filecatalog.h b/rtgui/filecatalog.h index 85e669c23..0eaf3c01c 100644 --- a/rtgui/filecatalog.h +++ b/rtgui/filecatalog.h @@ -134,6 +134,7 @@ class FileCatalog : public Gtk::VBox, void refreshEditedState (const std::set& efiles); // previewloaderlistener interface + void _previewReady (int dir_id, FileBrowserEntry* fdn); void previewReady (int dir_id, FileBrowserEntry* fdn); void previewsFinished (int dir_id); void _previewsFinished ();