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

fix crashes (info/toggle buttons, resize left panel) if no preview image has been loaded

Browse Source
This commit is contained in:
Andrey Skvortsov
2010-09-23 20:17:32 -07:00
parent 4dafe3efb5
commit 8311ab62ba
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rtgui/editorpanel.cc
View File

@@ -505,6 +505,8 @@ void EditorPanel::error (Glib::ustring descr) {
void EditorPanel::info_toggled () { void EditorPanel::info_toggled () {
if(!ipc)
return;
Glib::ustring infoString; Glib::ustring infoString;
const rtengine::ImageMetaData* idata = ipc->getInitialImage()->getMetaData(); const rtengine::ImageMetaData* idata = ipc->getInitialImage()->getMetaData();
@@ -912,6 +914,9 @@ void EditorPanel::historyBeforeLineChanged (const rtengine::procparams::ProcPara
void EditorPanel::beforeAfterToggled () { void EditorPanel::beforeAfterToggled () {
if(!ipc)
return;
removeIfThere (beforeAfterBox, beforeBox, false); removeIfThere (beforeAfterBox, beforeBox, false);
removeIfThere (afterBox, afterLabel, false); removeIfThere (afterBox, afterLabel, false);

4
rtgui/previewwindow.cc
View File

@@ -20,7 +20,7 @@
#include <guiutils.h> #include <guiutils.h>
#include <imagearea.h> #include <imagearea.h>
PreviewWindow::PreviewWindow () : previewHandler(NULL), mainCropWin(NULL),cCropMoving(NULL),cNormal(NULL), isMoving(false) { PreviewWindow::PreviewWindow () : previewHandler(NULL), mainCropWin(NULL),cCropMoving(NULL),cNormal(NULL), isMoving(false), imageArea(NULL) {
rconn = signal_size_allocate().connect( sigc::mem_fun(*this, &PreviewWindow::on_resized) ); rconn = signal_size_allocate().connect( sigc::mem_fun(*this, &PreviewWindow::on_resized) );
} }
@@ -99,7 +99,7 @@ bool PreviewWindow::on_expose_event (GdkEventExpose* event) {
int bufferW, bufferH; int bufferW, bufferH;
backBuffer->get_size (bufferW, bufferH); backBuffer->get_size (bufferW, bufferH);
if (!mainCropWin) { if (!mainCropWin && imageArea) {
mainCropWin = imageArea->getMainCropWindow (); mainCropWin = imageArea->getMainCropWindow ();
if (mainCropWin) if (mainCropWin)
mainCropWin->addCropWindowListener (this); mainCropWin->addCropWindowListener (this);