1 files changed, 8 insertions, 1 deletions

diff --git a/src/ui/dialog/export.cpp b/src/ui/dialog/export.cpp
index 1bb952de4..b7207fd50 100644
--- a/src/ui/dialog/export.cpp
+++ b/src/ui/dialog/export.cpp
@@ -978,7 +978,9 @@ void Export::onExport ()
 
     SPNamedView *nv = desktop->getNamedView();
     SPDocument *doc = desktop->getDocument();
-
+    Geom::Affine rot = doc->getRoot()->c2p;
+    doc->getRoot()->c2p = doc->getRoot()->rotation.inverse() * doc->getRoot()->c2p;
+    doc->ensureUpToDate();
     bool exportSuccessful = false;
 
     bool hide = hide_export.get_active ();
@@ -1003,6 +1005,7 @@ void Export::onExport ()
 
         if (num < 1) {
             desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("No items selected."));
+            doc->getRoot()->c2p *= doc->getRoot()->rotation;
             return;
         }
 
@@ -1094,6 +1097,7 @@ void Export::onExport ()
         if (filename.empty()) {
             desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("You have to enter a filename."));
             sp_ui_error_dialog(_("You have to enter a filename"));
+            doc->getRoot()->c2p *= doc->getRoot()->rotation;
             return;
         }
 
@@ -1110,6 +1114,7 @@ void Export::onExport ()
         if (!((x1 > x0) && (y1 > y0) && (width > 0) && (height > 0))) {
             desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("The chosen area to be exported is invalid."));
             sp_ui_error_dialog(_("The chosen area to be exported is invalid"));
+            doc->getRoot()->c2p *= doc->getRoot()->rotation;
             return;
         }
 
@@ -1132,6 +1137,7 @@ void Export::onExport ()
 
             g_free(safeDir);
             g_free(error);
+            doc->getRoot()->c2p *= doc->getRoot()->rotation;
             return;
         }
 
@@ -1281,6 +1287,7 @@ void Export::onExport ()
             }
         }
     }
+    doc->getRoot()->c2p *= doc->getRoot()->rotation;
 } // end of sp_export_export_clicked()
 
 /// Called when Browse button is clicked