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

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

Browse Source
This commit is contained in:
Hombre
2017-01-31 00:30:48 +01:00
parent 16f4731e0b 9ce41d8e91
commit 373e93ad4a
2 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rtgui/filebrowser.cc
View File

@@ -585,7 +585,6 @@ void FileBrowser::addEntry (FileBrowserEntry* entry)
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->selected = false;
entry->drawable = false; entry->drawable = false;
entry->framed = editedFiles.find (entry->filename) != editedFiles.end(); entry->framed = editedFiles.find (entry->filename) != editedFiles.end();

4
rtgui/main.cc
View File

@@ -85,11 +85,7 @@ Glib::ustring fname_to_utf8 (const char* fname)
} }
// This recursive mutex will be used by gdk_threads_enter/leave instead of a simple mutex // This recursive mutex will be used by gdk_threads_enter/leave instead of a simple mutex
#ifdef WIN32
static Glib::RecMutex myGdkRecMutex;
#else
static Glib::Threads::RecMutex myGdkRecMutex; static Glib::Threads::RecMutex myGdkRecMutex;
#endif
static void myGdkLockEnter() static void myGdkLockEnter()
{ {