Merged code missed in RTGUI
This commit is contained in:
@@ -140,7 +140,10 @@ bool Thumbnail::isSupported () {
|
||||
}
|
||||
|
||||
const ProcParams& Thumbnail::getProcParams () {
|
||||
//Glib::Mutex::Lock lock(mutex);
|
||||
// TODO: Check for Linux
|
||||
#ifdef WIN32
|
||||
Glib::Mutex::Lock lock(mutex);
|
||||
#endif
|
||||
|
||||
if (pparamsValid)
|
||||
return pparams;
|
||||
@@ -161,7 +164,10 @@ const ProcParams& Thumbnail::getProcParams () {
|
||||
}
|
||||
|
||||
void Thumbnail::loadProcParams () {
|
||||
//Glib::Mutex::Lock lock(mutex);
|
||||
// TODO: Check for Linux
|
||||
#ifdef WIN32
|
||||
Glib::Mutex::Lock lock(mutex);
|
||||
#endif
|
||||
|
||||
pparamsValid = false;
|
||||
if (options.paramsLoadLocation==PLL_Input) {
|
||||
@@ -183,7 +189,10 @@ void Thumbnail::loadProcParams () {
|
||||
}
|
||||
|
||||
void Thumbnail::clearProcParams (int whoClearedIt) {
|
||||
//Glib::Mutex::Lock lock(mutex);
|
||||
// TODO: Check for Linux
|
||||
#ifdef WIN32
|
||||
Glib::Mutex::Lock lock(mutex);
|
||||
#endif
|
||||
|
||||
cfs.recentlySaved = false;
|
||||
pparamsValid = false;
|
||||
@@ -211,7 +220,10 @@ bool Thumbnail::hasProcParams () {
|
||||
}
|
||||
|
||||
void Thumbnail::setProcParams (const ProcParams& pp, int whoChangedIt, bool updateCacheNow) {
|
||||
//Glib::Mutex::Lock lock(mutex);
|
||||
// TODO: Check for Linux
|
||||
#ifdef WIN32
|
||||
Glib::Mutex::Lock lock(mutex);
|
||||
#endif
|
||||
|
||||
if (pparams!=pp)
|
||||
cfs.recentlySaved = false;
|
||||
@@ -523,7 +535,10 @@ void Thumbnail::updateCache () {
|
||||
}
|
||||
|
||||
Thumbnail::~Thumbnail () {
|
||||
//Glib::Mutex::Lock lock(mutex);
|
||||
// TODO: Check for Linux
|
||||
#ifdef WIN32
|
||||
Glib::Mutex::Lock lock(mutex);
|
||||
#endif
|
||||
|
||||
delete [] lastImg;
|
||||
delete tpp;
|
||||
|
Reference in New Issue
Block a user