Эх сурвалжийг харах

fix wkhtmltoimage ignoring --javascript-delay and --window-status

This was due to e02ff7efaf7b617986fc11c08a693e203c64a465, which
attempted to solve #1892. However, this caused a regression as no
corresponding changes were made in wkhtmltoimage.

Fixes #2142
Ashish Kulkarni 10 жил өмнө
parent
commit
f77d32f6f9

+ 1 - 1
CHANGELOG.md

@@ -1,6 +1,6 @@
 v0.12.2.1 (unreleased)
 ----------------------
-
+* **#2142**: fix wkhtmltoimage ignoring --javascript-delay and --window-status
 
 v0.12.2 (2015-01-09)
 --------------------

+ 1 - 1
src/lib/imageconverter.cc

@@ -45,7 +45,7 @@ namespace wkhtmltopdf {
 
 ImageConverterPrivate::ImageConverterPrivate(ImageConverter & o, wkhtmltopdf::settings::ImageGlobal & s, const QString * data):
 	settings(s),
-	loader(s.loadGlobal),
+	loader(s.loadGlobal, true),
 	out(o) {
 	out.emitCheckboxSvgs(s.loadPage);
 	if (data) inputData = *data;