diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2010-06-16 08:21:01 +0000 |
|---|---|---|
| committer | Jon A. Cruz <jon@joncruz.org> | 2010-06-16 08:21:01 +0000 |
| commit | f298794999a742698fc33db1db864ceba3eeee1f (patch) | |
| tree | ee9a48dd315663f5ff65192ab31e5a1c881fbe92 /src/widgets | |
| parent | Move the task view changing to the "View" menu. Fixes bugs #170781 and #171663. (diff) | |
| download | inkscape-f298794999a742698fc33db1db864ceba3eeee1f.tar.gz inkscape-f298794999a742698fc33db1db864ceba3eeee1f.zip | |
Fix crash when bringing up F&S dialog with the CMS picker as default when an object with no icc-color is selected.
(bzr r9504)
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/sp-color-notebook.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/widgets/sp-color-notebook.cpp b/src/widgets/sp-color-notebook.cpp index a249786ff..6c5113084 100644 --- a/src/widgets/sp-color-notebook.cpp +++ b/src/widgets/sp-color-notebook.cpp @@ -519,6 +519,7 @@ void ColorNotebook::_rgbaEntryChanged(GtkEntry* entry) } } +// TODO pass in param so as to avoid the need for SP_ACTIVE_DOCUMENT void ColorNotebook::_updateRgbaEntry( const SPColor& color, gfloat alpha ) { g_return_if_fail( ( 0.0 <= alpha ) && ( alpha <= 1.0 ) ); @@ -539,7 +540,7 @@ void ColorNotebook::_updateRgbaEntry( const SPColor& color, gfloat alpha ) gtk_widget_set_sensitive (_box_toomuchink, false); if (color.icc){ Inkscape::ColorProfile* prof = SP_ACTIVE_DOCUMENT->profileManager->find(color.icc->colorProfile.c_str()); - if (prof->getColorSpace() == icSigCmykData || prof->getColorSpace() == icSigCmyData){ + if ( prof && ( (prof->getColorSpace() == icSigCmykData) || (prof->getColorSpace() == icSigCmyData) ) ) { gtk_widget_show(GTK_WIDGET(_box_toomuchink)); double ink_sum = 0; for (unsigned int i=0; i<color.icc->colors.size(); i++){ |