Merge branch 'master' into gtk3

This commit is contained in:
Morgan Hardwood
2016-07-09 23:49:31 +02:00
49 changed files with 418 additions and 419 deletions

View File

@@ -607,7 +607,7 @@ void FileBrowser::addEntry_ (FileBrowserEntry* entry)
std::vector<ThumbBrowserEntryBase*>::iterator i = fd.begin();
while (i != fd.end() && *entry < * ((FileBrowserEntry*)*i)) {
i++;
++i;
}
fd.insert (i, entry);
@@ -624,7 +624,7 @@ FileBrowserEntry* FileBrowser::delEntry (const Glib::ustring& fname)
{
MYWRITERLOCK(l, entryRW);
for (std::vector<ThumbBrowserEntryBase*>::iterator i = fd.begin(); i != fd.end(); i++)
for (std::vector<ThumbBrowserEntryBase*>::iterator i = fd.begin(); i != fd.end(); ++i)
if ((*i)->filename == fname) {
ThumbBrowserEntryBase* entry = *i;
entry->selected = false;