summaryrefslogtreecommitdiffstats
path: root/src/widgets
diff options
context:
space:
mode:
authorMatthew Petroff <matthew@mpetroff.net>2013-06-25 00:53:34 +0000
committerMatthew Petroff <matthew@mpetroff.net>2013-06-25 00:53:34 +0000
commit08807d307231af4c69dd55794fb6c1bcc1df7b04 (patch)
treef0f44e0fd5b8ca5f6736235cdd098963f5fb08fa /src/widgets
parentAdded length class. (diff)
parentCorrectly ignore symbolic link to ltmain.sh (diff)
downloadinkscape-08807d307231af4c69dd55794fb6c1bcc1df7b04.tar.gz
inkscape-08807d307231af4c69dd55794fb6c1bcc1df7b04.zip
Merge from trunk.
(bzr r12380.1.2)
Diffstat (limited to 'src/widgets')
-rw-r--r--src/widgets/sp-color-icc-selector.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/widgets/sp-color-icc-selector.cpp b/src/widgets/sp-color-icc-selector.cpp
index 00b00ce38..53e73dd57 100644
--- a/src/widgets/sp-color-icc-selector.cpp
+++ b/src/widgets/sp-color-icc-selector.cpp
@@ -272,7 +272,8 @@ static void sp_color_icc_selector_class_init(SPColorICCSelectorClass *klass)
ColorICCSelector::ColorICCSelector( SPColorSelector* csel )
- : ColorSelector( csel )
+ : ColorSelector( csel ),
+ _impl(NULL)
{
}
@@ -429,7 +430,8 @@ ColorICCSelectorImpl::~ColorICCSelectorImpl()
void ColorICCSelector::init()
{
- _impl = new ColorICCSelectorImpl(this);
+ if (_impl) delete(_impl);
+ _impl = new ColorICCSelectorImpl(this);
gint row = 0;
_impl->_updating = FALSE;