diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2013-02-04 18:54:53 +0000 |
|---|---|---|
| committer | tavmjong-free <tavmjong@free.fr> | 2013-02-04 18:54:53 +0000 |
| commit | 048beb0d69537f56f6b662830356553e469a4259 (patch) | |
| tree | 353c4f2c7979cceeeab591eb72f067e0502390fe /src/widgets/text-toolbar.cpp | |
| parent | Add explicit configure.ac check for pangoft2 (diff) | |
| download | inkscape-048beb0d69537f56f6b662830356553e469a4259.tar.gz inkscape-048beb0d69537f56f6b662830356553e469a4259.zip | |
Only set up text-tool bar if has actually been created. Ensures proper initialization after creation.
(bzr r12099)
Diffstat (limited to 'src/widgets/text-toolbar.cpp')
| -rw-r--r-- | src/widgets/text-toolbar.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/widgets/text-toolbar.cpp b/src/widgets/text-toolbar.cpp index dc4a6be27..6adff8bfb 100644 --- a/src/widgets/text-toolbar.cpp +++ b/src/widgets/text-toolbar.cpp @@ -1173,6 +1173,13 @@ static void sp_text_toolbox_selection_changed(Inkscape::Selection */*selection*/ std::cout << selected_text << std::endl; #endif + // Check if the toolbar has been created; quit if it has not. + Ink_ComboBoxEntry_Action* fontFamilyAction = + INK_COMBOBOXENTRY_ACTION( g_object_get_data( tbl, "TextFontFamilyAction" ) ); + if( fontFamilyAction->combobox == NULL ) { + return; + } + // quit if run by the _changed callbacks if (g_object_get_data(G_OBJECT(tbl), "freeze")) { #ifdef DEBUG_TEXT |