Bugfix issue #459: crash if info button pressed while no image present in editor (Single tab mode)

This commit is contained in:
ffsup2 2011-01-15 23:11:12 +01:00
parent e3957e6c5d
commit 4bd99022ae

View File

@ -598,7 +598,7 @@ void EditorPanel::error (Glib::ustring descr) {
void EditorPanel::info_toggled () { void EditorPanel::info_toggled () {
Glib::ustring infoString; Glib::ustring infoString;
if (!ipc || !openThm) return;
const rtengine::ImageMetaData* idata = ipc->getInitialImage()->getMetaData(); const rtengine::ImageMetaData* idata = ipc->getInitialImage()->getMetaData();
if (idata && idata->hasExif()) if (idata && idata->hasExif())
// infoString = Glib::ustring::compose ("%1 %2\nF/%3 %4 sec\n%5: %6\n%7: %8 mm\n", // infoString = Glib::ustring::compose ("%1 %2\nF/%3 %4 sec\n%5: %6\n%7: %8 mm\n",
@ -801,7 +801,7 @@ bool EditorPanel::idle_imageSaved(ProgressConnector<int> *pc,rtengine::IImage16*
} }
void EditorPanel::saveAsPressed () { void EditorPanel::saveAsPressed () {
if (!ipc || !openThm) return;
bool fnameOK = false; bool fnameOK = false;
Glib::ustring fname; Glib::ustring fname;
@ -881,12 +881,13 @@ void EditorPanel::saveAsPressed () {
} }
void EditorPanel::queueImgPressed () { void EditorPanel::queueImgPressed () {
if (!ipc || !openThm) return;
saveProfile (); saveProfile ();
parent->addBatchQueueJob (createBatchQueueEntry ()); parent->addBatchQueueJob (createBatchQueueEntry ());
} }
void EditorPanel::sendToGimpPressed () { void EditorPanel::sendToGimpPressed () {
if (!ipc || !openThm) return;
// develop image // develop image
rtengine::procparams::ProcParams pparams; rtengine::procparams::ProcParams pparams;
ipc->getParams (&pparams); ipc->getParams (&pparams);