Porting following changsets to Default for the merge :

- 7faf00bc5cbe
- 6f9407b451af
This commit is contained in:
Hombre
2011-06-28 23:40:37 +02:00
parent 58efd5c861
commit 49b7100e4a
6 changed files with 27 additions and 13 deletions

View File

@@ -667,9 +667,13 @@ void FileCatalog::refreshHeight () {
void FileCatalog::_openImage (std::vector<Thumbnail*> tmb) {
if (enabled && listener!=NULL) {
for (size_t i=0; i<tmb.size(); i++) {
if (editedFiles.find (tmb[i]->getFileName())==editedFiles.end())
listener->fileSelected (tmb[i]);
bool continueToLoad=true;
for (size_t i=0; i< tmb.size() && continueToLoad; i++) {
if (editedFiles.find (tmb[i]->getFileName())==editedFiles.end()){
listener->fileSelected (tmb[i]);
if( !options.tabbedUI )
continueToLoad = false;
}
tmb[i]->decreaseRef ();
}
}