diff options
| author | Liam P. White <inkscapebrony@gmail.com> | 2016-01-16 03:17:48 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebrony@gmail.com> | 2016-01-16 03:17:48 +0000 |
| commit | 1aa94f627221dff927966c6df8f9e53d917b57df (patch) | |
| tree | 3b919a9fee35ea99c85f7ba4a2510d1dc935d3ce /src/sp-guide.cpp | |
| parent | cmake: Fix out of tree builds (diff) | |
| download | inkscape-1aa94f627221dff927966c6df8f9e53d917b57df.tar.gz inkscape-1aa94f627221dff927966c6df8f9e53d917b57df.zip | |
Remove buggy and presumptuous usage of SP_ACTIVE_DESKTOP in renderer code; fixes 1526701
Fixed bugs:
- https://launchpad.net/bugs/1526701
(bzr r14585.1.1)
Diffstat (limited to 'src/sp-guide.cpp')
| -rw-r--r-- | src/sp-guide.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/sp-guide.cpp b/src/sp-guide.cpp index a57947e01..2bfd0c656 100644 --- a/src/sp-guide.cpp +++ b/src/sp-guide.cpp @@ -25,6 +25,7 @@ #include "display/sp-canvas.h" #include "display/guideline.h" +#include "display/sodipodi-ctrl.h" #include "svg/svg.h" #include "svg/svg-color.h" #include "svg/stringstream.h" @@ -289,7 +290,7 @@ void SPGuide::showSPGuide() for(std::vector<SPGuideLine *>::const_iterator it = this->views.begin(); it != this->views.end(); ++it) { sp_canvas_item_show(SP_CANVAS_ITEM(*it)); if((*it)->origin) { - (*it)->origin->show(); + sp_canvas_item_show(SP_CANVAS_ITEM((*it)->origin)); } else { //reposition to same place to show knots sp_guideline_set_position(*it, point_on_line); @@ -317,7 +318,7 @@ void SPGuide::hideSPGuide() for(std::vector<SPGuideLine *>::const_iterator it = this->views.begin(); it != this->views.end(); ++it) { sp_canvas_item_hide(SP_CANVAS_ITEM(*it)); if ((*it)->origin) { - (*it)->origin->hide(); + sp_canvas_item_hide(SP_CANVAS_ITEM((*it)->origin)); } } } |