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

Solving issue 1907: "New version compiled today does not start", that was affecting Linux systems like Ubuntu 12.04

Browse Source
This commit is contained in:
natureh 510
2013-06-29 22:08:42 +02:00
parent c935d4882b
commit 97cdd4a3e2
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
rtgui/main.cc
View File

@@ -24,7 +24,6 @@
// This file is for your program, I won't touch it again! // This file is for your program, I won't touch it again!
#include "config.h" #include "config.h"
#include <glibmm/thread.h>
#include <gtkmm.h> #include <gtkmm.h>
#include <giomm.h> #include <giomm.h>
#include <iostream> #include <iostream>
@@ -42,6 +41,9 @@
#include <glibmm/fileutils.h> #include <glibmm/fileutils.h>
#include <glib.h> #include <glib.h>
#include <glib/gstdio.h> #include <glib/gstdio.h>
#include <glibmm/threads.h>
#else
#include <glibmm/thread.h>
#endif #endif
#include "../rtengine/safegtk.h" #include "../rtengine/safegtk.h"
@@ -57,8 +59,12 @@ bool simpleEditor;
Glib::Thread* mainThread; Glib::Thread* mainThread;
// This recursive mutex will be used by g_thread_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; static Glib::RecMutex myGdkRecMutex;
#else
static Glib::Threads::RecMutex myGdkRecMutex;
#endif
static void myGdkLockEnter() { myGdkRecMutex.lock(); } static void myGdkLockEnter() { myGdkRecMutex.lock(); }
static void myGdkLockLeave() { static void myGdkLockLeave() {
@@ -122,7 +128,8 @@ int main(int argc, char **argv)
#endif #endif
Glib::thread_init(); Glib::thread_init();
gdk_threads_set_lock_functions(G_CALLBACK(myGdkLockEnter), ((GCallback) (myGdkLockLeave))); gdk_threads_set_lock_functions(G_CALLBACK(myGdkLockEnter), (G_CALLBACK(myGdkLockLeave)));
gdk_threads_set_lock_functions(G_CALLBACK(myGdkLockEnter), (G_CALLBACK(myGdkLockLeave)));
gdk_threads_init(); gdk_threads_init();
Gio::init (); Gio::init ();