diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-08-18 21:05:56 +0000 |
|---|---|---|
| committer | Javiertxo <jtx@jtx.marker.es> | 2013-08-18 21:05:56 +0000 |
| commit | ac014eea08f219ba91c6c31240e140c0b7e67ad5 (patch) | |
| tree | 76ca4df51a837392a25c701a5c1c8810d7364b98 /src/path-chemistry.cpp | |
| parent | update to trunk (diff) | |
| parent | Prevent writing out empty style strings. (diff) | |
| download | inkscape-ac014eea08f219ba91c6c31240e140c0b7e67ad5.tar.gz inkscape-ac014eea08f219ba91c6c31240e140c0b7e67ad5.zip | |
update to trunk
(bzr r11950.1.128)
Diffstat (limited to 'src/path-chemistry.cpp')
| -rw-r--r-- | src/path-chemistry.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/path-chemistry.cpp b/src/path-chemistry.cpp index b192904ce..e1924664b 100644 --- a/src/path-chemistry.cpp +++ b/src/path-chemistry.cpp @@ -294,18 +294,16 @@ sp_selected_path_break_apart(SPDesktop *desktop) /* This function is an entry point from GUI */ void -sp_selected_path_to_curves(SPDesktop *desktop, bool interactive) +sp_selected_path_to_curves(Inkscape::Selection *selection, SPDesktop *desktop, bool interactive) { - Inkscape::Selection *selection = sp_desktop_selection(desktop); - if (selection->isEmpty()) { - if (interactive) + if (interactive && desktop) sp_desktop_message_stack(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select <b>object(s)</b> to convert to path.")); return; } bool did = false; - if (interactive) { + if (interactive && desktop) { desktop->messageStack()->flash(Inkscape::IMMEDIATE_MESSAGE, _("Converting objects to paths...")); // set "busy" cursor desktop->setWaitingCursor(); @@ -324,7 +322,7 @@ sp_selected_path_to_curves(SPDesktop *desktop, bool interactive) g_slist_free (to_select); g_slist_free (selected); - if (interactive) { + if (interactive && desktop) { desktop->clearWaitingCursor(); if (did) { DocumentUndo::done(sp_desktop_document(desktop), SP_VERB_OBJECT_TO_CURVE, |