post-process resources only for the main resource loader

Currently, all resources (regardless of the resource loader) were
post-processed with the following steps:
* user-supplied javascript (via --run-script)
* javascript finish delay  (via --javascript-delay)
* wait for window status   (via --window-status)

These are not relevant for any loader other than pageLoader,
so skip running the above steps unless it is the main loader which
fixes #1892 and #1725

CHANGELOG.md

@@ -16,6 +16,7 @@ v0.12.2 (unreleased)
 * **#1808**: fix [sitepage] and [sitepages] not working without HTML headers/footers
 * **#1825**: fix handling of non-ASCII characters in command-line arguments
 * **#1863**: **[qt]** blank page or crash with low DPI on Windows
+* **#1892**: --window-status causes endless loop with --header-html
 * **#1906**: fix wrong comparison when parsing list parameters
 * **#1944**: **[breaking change]** fix the reflection subsystem to fix the non-functional API
 * **#1949**: fix generation of tarball in the posix-local build

include/wkhtmltox/multipageloader.hh

@@ -45,7 +45,7 @@ class DLL_LOCAL MultiPageLoaderPrivate;
 class DLL_LOCAL MultiPageLoader: public QObject {
 	Q_OBJECT
 public:
-	MultiPageLoader(settings::LoadGlobal & s);
+	MultiPageLoader(settings::LoadGlobal & s, bool mainLoader = false);
 	~MultiPageLoader();
 	LoaderObject * addResource(const QString & url, const settings::LoadPage & settings, const QString * data=NULL);
 	LoaderObject * addResource(const QUrl & url, const settings::LoadPage & settings);

src/lib/multipageloader.cc

@@ -252,6 +252,11 @@ void ResourceObject::loadFinished(bool ok) {
 			warning(QString("Failed loading page ") + url.toString() + " (ignored)");
 	}
 
+	if (!multiPageLoader.isMainLoader) {
+		loadDone();
+		return;
+	}
+
 	// Evaluate extra user supplied javascript
 	foreach (const QString & str, settings.runScript)
 		webPage.mainFrame()->evaluateJavaScript(str);
@@ -568,8 +573,9 @@ void MultiPageLoaderPrivate::fail() {
   \brief Construct a multipage loader object, load settings read from the supplied settings
   \param s The settings to be used while loading pages
 */
-MultiPageLoader::MultiPageLoader(settings::LoadGlobal & s):
+MultiPageLoader::MultiPageLoader(settings::LoadGlobal & s, bool mainLoader):
 	d(new MultiPageLoaderPrivate(s, *this)) {
+	d->isMainLoader = mainLoader;
 }
 
 MultiPageLoader::~MultiPageLoader() {

src/lib/multipageloader.hh

@@ -48,7 +48,7 @@ class DLL_LOCAL MultiPageLoaderPrivate;
 class DLL_LOCAL MultiPageLoader: public QObject {
 	Q_OBJECT
 public:
-	MultiPageLoader(settings::LoadGlobal & s);
+	MultiPageLoader(settings::LoadGlobal & s, bool mainLoader = false);
 	~MultiPageLoader();
 	LoaderObject * addResource(const QString & url, const settings::LoadPage & settings, const QString * data=NULL);
 	LoaderObject * addResource(const QUrl & url, const settings::LoadPage & settings);

src/lib/multipageloader_p.hh

@@ -120,6 +120,7 @@ public:
 
 	int loading;
 	int progressSum;
+	bool isMainLoader;
 	bool loadStartedEmitted;
 	bool hasError;
 	bool finishedEmitted;

src/lib/pdfconverter.cc

@@ -76,7 +76,7 @@ bool DLL_LOCAL looksLikeHtmlAndNotAUrl(QString str) {
 }
 
 PdfConverterPrivate::PdfConverterPrivate(PdfGlobal & s, PdfConverter & o) :
-	settings(s), pageLoader(s.load),
+	settings(s), pageLoader(s.load, true),
 	out(o), printer(0), painter(0)
 #ifdef __EXTENSIVE_WKHTMLTOPDF_QT_HACK__
     , webPrinter(0), measuringHFLoader(s.load), hfLoader(s.load), tocLoader1(s.load), tocLoader2(s.load)