From ae35542193718edc72e07f215ea90acbdf5df53c Mon Sep 17 00:00:00 2001
From: l_maliakal_d <l_maliakal_d@af1100a4-978c-4157-bff7-07162d2ba061>
Date: Mon, 5 Aug 2013 15:36:36 +0000
Subject: [PATCH] ask before disabling file write and fixed the ccorrect source
 for it

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@216 af1100a4-978c-4157-bff7-07162d2ba061
---
 slsDetectorGui/src/qTabDataOutput.cpp  | 2 +-
 slsDetectorGui/src/qTabMeasurement.cpp | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/slsDetectorGui/src/qTabDataOutput.cpp b/slsDetectorGui/src/qTabDataOutput.cpp
index 5c4beff33..758887a60 100644
--- a/slsDetectorGui/src/qTabDataOutput.cpp
+++ b/slsDetectorGui/src/qTabDataOutput.cpp
@@ -633,7 +633,7 @@ int qTabDataOutput::VerifyOutputDirectory(){
 #ifdef VERBOSE
 		cout << "The output path doesnt exist anymore" << endl;
 #endif
-		qDefs::Message(qDefs::WARNING,string("Invalid Output Directory ")+ mess ,"qTabDataOutput::SetAngularCorrection");
+		qDefs::Message(qDefs::WARNING,string("Invalid Output Directory ")+ mess ,"qTabDataOutput::VerifyOutputDirectory");
 		dispReadOutputDir->setPalette(*red1);
 		boxOutDir->setPalette(red);
 
diff --git a/slsDetectorGui/src/qTabMeasurement.cpp b/slsDetectorGui/src/qTabMeasurement.cpp
index 50effb59a..085959aee 100644
--- a/slsDetectorGui/src/qTabMeasurement.cpp
+++ b/slsDetectorGui/src/qTabMeasurement.cpp
@@ -310,9 +310,11 @@ void qTabMeasurement::setRunIndex(int index){
 
 void qTabMeasurement::startStopAcquisition(){
 	if(btnStartStop->isChecked()){
-		if(thisParent->DoesOutputDirExist() == slsDetectorDefs::FAIL){
+
+		//if file write enabled and output dir doesnt exist
+		if((chkFile->isChecked())&&(thisParent->DoesOutputDirExist() == slsDetectorDefs::FAIL)){
 			if(qDefs::Message(qDefs::QUESTION,
-					"Your data will not be saved. Proceed with acquisition anyway?",
+					"<nobr>Your data will not be saved.</nobr><br><nobr>Disable File write and Proceed with acquisition anyway?</nobr>",
 					"qTabMeasurement::startStopAcquisition") == slsDetectorDefs::FAIL){
 				disconnect(btnStartStop,SIGNAL(clicked()),this,SLOT(startStopAcquisition()));
 				btnStartStop->click();