diff options
| author | Liam P. White <inkscapebrony@gmail.com> | 2014-06-27 19:23:06 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebrony@gmail.com> | 2014-06-27 19:23:06 +0000 |
| commit | 45f373f3319b598d8e0222fb48e9d3a4760b2044 (patch) | |
| tree | 846a9ec382567267b09e63c3dde2e1f20cbbffb5 /src/extension/effect.cpp | |
| parent | Move constructor/destructor into private section, remove protected section. R... (diff) | |
| download | inkscape-45f373f3319b598d8e0222fb48e9d3a4760b2044.tar.gz inkscape-45f373f3319b598d8e0222fb48e9d3a4760b2044.zip | |
5. Refactoring of Application class: make copy/assignment operators private, disallow pointers to Application
(bzr r13341.5.9)
Diffstat (limited to 'src/extension/effect.cpp')
| -rw-r--r-- | src/extension/effect.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/extension/effect.cpp b/src/extension/effect.cpp index c68845d8a..c8f3b2ff9 100644 --- a/src/extension/effect.cpp +++ b/src/extension/effect.cpp @@ -89,11 +89,13 @@ Effect::Effect (Inkscape::XML::Node * in_repr, Implementation::Implementation * } // children of "inkscape-extension" } // if we have an XML file - if (INKSCAPE != NULL && INKSCAPE->use_gui()) { + // \TODO this gets called from the Inkscape::Application constructor, where it initializes the menus. + // But in the constructor, our object isn't quite there yet! + if (Inkscape::Application::exists() && INKSCAPE.use_gui()) { if (_effects_list == NULL) - _effects_list = find_menu(INKSCAPE->get_menus(), EFFECTS_LIST); + _effects_list = find_menu(INKSCAPE.get_menus(), EFFECTS_LIST); if (_filters_list == NULL) - _filters_list = find_menu(INKSCAPE->get_menus(), FILTERS_LIST); + _filters_list = find_menu(INKSCAPE.get_menus(), FILTERS_LIST); } if ((_effects_list != NULL || _filters_list != NULL)) { |