Merge from branch 3.0

2011-01-19 22:56:56 +01:00
parent 16c12e6db8
commit 71aac59573
9 changed files with 96 additions and 65 deletions
--- a/rtgui/imagearea.cc
+++ b/rtgui/imagearea.cc
@@ -76,8 +76,22 @@ void ImageArea::on_resized (Gtk::Allocation& req) {
 }

 void ImageArea::setImProcCoordinator (rtengine::StagedImageProcessor* ipc_) {
+    if( !ipc_ ){
+        focusGrabber = NULL;
+        std::list<CropWindow*>::iterator i = cropWins.begin();
+        if( i!=cropWins.end() ){
+            (*i)->getPosition (lastClosedX, lastClosedY);
+            (*i)->getSize (lastClosedW, lastClosedH);
+        }
+        for( ;i!=cropWins.end();i++ ){
+        	delete *i;
+        }
+        cropWins.clear();

+        mainCropWindow->setObservedCropWin (NULL);
+    }
    ipc = ipc_;
+
 }

 void ImageArea::setPreviewHandler (PreviewHandler* ph) {