From 745d4fc251ed710cba892fd177e92c6502eea736 Mon Sep 17 00:00:00 2001 From: acspike Date: Sun, 26 Mar 2006 19:19:01 +0000 Subject: [PATCH] clarify case for --export-id and --export-drawing --- src/main.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index fdfa3aa7b..3c3655175 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -778,19 +778,18 @@ sp_do_export_png(SPDocument *doc) if (sp_export_id || sp_export_area_drawing) { SPObject *o = NULL; - if (sp_export_id) { + SPObject *o_area = NULL; + if (sp_export_id && sp_export_area_drawing) { + o = doc->getObjectById(sp_export_id); + o_area = SP_DOCUMENT_ROOT (doc); + } else if (sp_export_id) { o = doc->getObjectById(sp_export_id); + o_area = o; } else if (sp_export_area_drawing) { o = SP_DOCUMENT_ROOT (doc); + o_area = o; } - SPObject *o_area = NULL; - if (sp_export_area_drawing) { - o_area = SP_DOCUMENT_ROOT (doc); - } else if (sp_export_id) { - o_area = doc->getObjectById(sp_export_id); - } - if (o) { if (!SP_IS_ITEM (o)) { g_warning("Object with id=\"%s\" is not a visible item. Nothing exported.", sp_export_id); -- 2.30.2