From b1c2480c3ed8105426eba01c2df61b1cb4618bf7 Mon Sep 17 00:00:00 2001
From: Hombre <natureh.510@gmail.com>
Date: Fri, 30 Aug 2013 21:36:23 +0200
Subject: [PATCH] Solving issue 1961: "Gui freezes when using 'apply-partial'"
 + fix an include in order to use the TRACE_MYRWMUTEX define

---
 rtgui/filebrowser.cc | 7 ++++++-
 rtgui/threadutils.h  | 6 +++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/rtgui/filebrowser.cc b/rtgui/filebrowser.cc
index 79a225831..67eede569 100644
--- a/rtgui/filebrowser.cc
+++ b/rtgui/filebrowser.cc
@@ -1099,19 +1099,24 @@ void FileBrowser::applyMenuItemActivated (Glib::ustring ppname) {
 
 void FileBrowser::applyPartialMenuItemActivated (Glib::ustring ppname) {
 
-	// TODO: Check for Linux
+	{
 	#if PROTECT_VECTORS
 	MYREADERLOCK(l, entryRW);
 	#endif
 
 	if (!tbl || selected.empty())
 		return;
+	}
 
 	const rtengine::procparams::PartialProfile* srcProfiles = profileStore.getProfile (ppname);
 
 	if (srcProfiles->pparams) {
 		if (partialPasteDlg.run()==Gtk::RESPONSE_OK) {
 
+			#if PROTECT_VECTORS
+			MYREADERLOCK(l, entryRW);
+			#endif
+
 			if (bppcl)
 				bppcl->beginBatchPParamsChange(selected.size());
 			for (size_t i=0; i<selected.size(); i++) {
diff --git a/rtgui/threadutils.h b/rtgui/threadutils.h
index 907d521e0..81d2c9917 100644
--- a/rtgui/threadutils.h
+++ b/rtgui/threadutils.h
@@ -23,7 +23,7 @@
 
 #include <glibmm.h>
 #include <csignal>  // for raise()
-#include <cstdio>
+#include <iostream>
 
 #ifdef WIN32
 #include <windows.h>
@@ -87,7 +87,7 @@ public:
 		#if STRICT_MUTEX || !defined(NDEBUG)
 		if (alreadyLocked) {
 			#ifndef NDEBUG
-			printf("Warning: MyMutex already locked!\n"); // breakpoint
+			std::cout << "Warning: MyMutex already locked!" << std::endl; // breakpoint
 			#endif
 			#if STRICT_MUTEX
 				#ifndef NDEBUG
@@ -115,7 +115,7 @@ public:
 			#if STRICT_MUTEX || !defined(NDEBUG)
 			if (alreadyLocked) {
 				#ifndef NDEBUG
-				printf("Warning: MyMutex already locked!\n"); // breakpoint
+				std::cout << "Warning: MyMutex already locked!" << std::endl; // breakpoint
 				#endif
 				#if STRICT_MUTEX
 					#ifndef NDEBUG