added fix from Dale Harvey to expand incomplete JIDs specified in user

[inkscape.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index fdfa3aa7bb1f57eaa42c96d2138979a505eb3f32..3c3655175b4290be8ddb1e95eee552925d0b6b9f 100644 (file)
--- 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);