Merge remote-tracking branch 'origin/master' into gtk3

2017-01-31 00:30:48 +01:00
parent 16f4731e0b 9ce41d8e91
commit 373e93ad4a
2 changed files with 0 additions and 5 deletions
--- a/rtgui/filebrowser.cc
+++ b/rtgui/filebrowser.cc
@@ -585,7 +585,6 @@ void FileBrowser::addEntry (FileBrowserEntry* entry)

 void FileBrowser::addEntry_ (FileBrowserEntry* entry)
 {
-    GThreadLock lock; // All GUI acces from idle_add callbacks or separate thread HAVE to be protected
    entry->selected = false;
    entry->drawable = false;
    entry->framed = editedFiles.find (entry->filename) != editedFiles.end();