summaryrefslogtreecommitdiffstats
path: root/src/extension/internal/pdfinput/pdf-input.cpp
diff options
context:
space:
mode:
authorbulia byak <buliabyak@gmail.com>2008-06-12 17:05:57 +0000
committerbuliabyak <buliabyak@users.sourceforge.net>2008-06-12 17:05:57 +0000
commit4a537dcd912a492a7d21921bbce315246b209861 (patch)
treeee9c822698398f4d97cc846a06eba5487d78f1b6 /src/extension/internal/pdfinput/pdf-input.cpp
parentFix bug: allow curved paths again when switching back from 'wait for path' mo... (diff)
downloadinkscape-4a537dcd912a492a7d21921bbce315246b209861.tar.gz
inkscape-4a537dcd912a492a7d21921bbce315246b209861.zip
prevent crashing by not running prefs dialog when in command line mode
(bzr r5907)
Diffstat (limited to 'src/extension/internal/pdfinput/pdf-input.cpp')
-rw-r--r--src/extension/internal/pdfinput/pdf-input.cpp23
1 files changed, 16 insertions, 7 deletions
diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
index 1de74541b..e34c76cb1 100644
--- a/src/extension/internal/pdfinput/pdf-input.cpp
+++ b/src/extension/internal/pdfinput/pdf-input.cpp
@@ -36,6 +36,7 @@
#include "pdf-parser.h"
#include "document-private.h"
+#include "application/application.h"
#include "dialogs/dialog-events.h"
#include <gtk/gtkdialog.h>
@@ -626,16 +627,23 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
return NULL;
}
- PdfImportDialog *dlg = new PdfImportDialog(pdf_doc, uri);
- if (!dlg->showDialog()) {
- delete dlg;
- delete pdf_doc;
- return NULL;
+ PdfImportDialog *dlg = NULL;
+ if (Inkscape::NSApplication::Application::getUseGui()) {
+ dlg = new PdfImportDialog(pdf_doc, uri);
+ if (!dlg->showDialog()) {
+ delete dlg;
+ delete pdf_doc;
+ return NULL;
+ }
}
// Get needed page
- int page_num = dlg->getSelectedPage();
+ int page_num;
+ if (dlg)
+ page_num = dlg->getSelectedPage();
+ else
+ page_num = 1;
Catalog *catalog = pdf_doc->getCatalog();
Page *page = catalog->getPage(page_num);
@@ -653,7 +661,8 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
// Get preferences
Inkscape::XML::Node *prefs = builder->getPreferences();
- dlg->getImportSettings(prefs);
+ if (dlg)
+ dlg->getImportSettings(prefs);
// Apply crop settings
PDFRectangle *clipToBox = NULL;