diff --git a/src/file.cpp b/src/file.cpp
index 8f4b2a9c1faf2d9b470c3aba37b12b7185160b6c..f4630719b27eb88f0343c1f25c6d3a6814c99483 100644 (file)
--- a/src/file.cpp
+++ b/src/file.cpp
try {
Inkscape::Extension::save(key, doc, uri.c_str(),
- saveas && prefs_get_int_attribute("dialogs.save_as", "append_extension", 1),
+ false,
saveas, official);
} catch (Inkscape::Extension::Output::no_extension_found &e) {
gchar *safeUri = Inkscape::IO::sanitizeString(uri.c_str());
-static Inkscape::UI::Dialog::FileSaveDialog *saveDialogInstance = NULL;
-
/**
* Display a SaveAs dialog. Save the document if OK pressed.
*
Inkscape::XML::Node *repr = sp_document_repr_root(doc);
- Inkscape::Extension::Output *extension;
+ Inkscape::Extension::Output *extension = 0;
//# Get the default extension name
Glib::ustring default_extension;
} else {
dialog_title = (char const *) _("Select file to save to");
}
- if (!saveDialogInstance)
- saveDialogInstance =
- Inkscape::UI::Dialog::FileSaveDialog::create(
- save_loc,
- Inkscape::UI::Dialog::SVG_TYPES,
- (char const *) _("Select file to save to"),
- default_extension
+ Inkscape::UI::Dialog::FileSaveDialog *saveDialog =
+ Inkscape::UI::Dialog::FileSaveDialog::create(
+ save_loc,
+ Inkscape::UI::Dialog::SVG_TYPES,
+ (char const *) _("Select file to save to"),
+ default_extension
);
- else
- saveDialogInstance->change_path(save_loc);
- saveDialogInstance->change_title(dialog_title);
-
- bool success = saveDialogInstance->show();
- if (!success)
- return success;
- Glib::ustring fileName = saveDialogInstance->getFilename();
+ saveDialog->change_title(dialog_title);
+ saveDialog->setSelectionType(extension);
- Inkscape::Extension::Extension *selectionType =
- saveDialogInstance->getSelectionType();
+ bool success = saveDialog->show();
+ if (!success) {
+ delete saveDialog;
+ return success;
+ }
+
+ Glib::ustring fileName = saveDialog->getFilename();
+ Inkscape::Extension::Extension *selectionType = saveDialog->getSelectionType();
+ delete saveDialog;
+ saveDialog = 0;
if (fileName.size() > 0) {
Glib::ustring newFileName = Glib::filename_to_utf8(fileName);