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

Bugfix for issue #476

Browse Source 
crash: open new image while zoom window is open
This commit is contained in:
ffsup2
2011-01-19 20:10:21 +01:00
parent eb793cb46a
commit 55591bfa2a
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rtgui/editorpanel.cc
View File

@@ -402,14 +402,13 @@ void EditorPanel::close () {
delete previewHandler; delete previewHandler;
previewHandler= NULL; previewHandler= NULL;
rtengine::StagedImageProcessor::destroy (ipc);
ipc = NULL;
if(iarea) if(iarea)
{ {
iarea->imageArea->setPreviewHandler (NULL); iarea->imageArea->setPreviewHandler (NULL);
iarea->imageArea->setImProcCoordinator (NULL); iarea->imageArea->setImProcCoordinator (NULL);
} }
rtengine::StagedImageProcessor::destroy (ipc);
ipc = NULL;
navigator->previewWindow->setPreviewHandler (NULL); navigator->previewWindow->setPreviewHandler (NULL);
// navigator->previewWindow->setImageArea (NULL); // navigator->previewWindow->setImageArea (NULL);

14
rtgui/imagearea.cc
View File

@@ -76,8 +76,22 @@ void ImageArea::on_resized (Gtk::Allocation& req) {
} }
void ImageArea::setImProcCoordinator (rtengine::StagedImageProcessor* ipc_) { 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_; ipc = ipc_;
} }
void ImageArea::setPreviewHandler (PreviewHandler* ph) { void ImageArea::setPreviewHandler (PreviewHandler* ph) {