From 54837829493549a536e56b39d6d9529ee115d489 Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Wed, 27 Sep 2023 17:14:01 +0200
Subject: [PATCH] [session] load_common as separate function

Call it instead of display_timer in delayed_reload
---
 src/ecmascript/ecmascript.cpp | 5 ++++-
 src/session/session.cpp       | 6 +++++-
 src/session/session.h         | 2 ++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/ecmascript/ecmascript.cpp b/src/ecmascript/ecmascript.cpp
index f586f47b..7cab9849 100644
--- a/src/ecmascript/ecmascript.cpp
+++ b/src/ecmascript/ecmascript.cpp
@@ -309,11 +309,14 @@ static void
 delayed_reload(void *data)
 {
 	struct delayed_rel *rel = (struct delayed_rel *)data;
+	struct session *ses = rel->ses;
 
 	assert(rel);
 	reset_document(rel->document);
 	dump_xhtml(rel->cached, rel->document, rel->was_write);
-	display_timer(rel->ses);
+
+	draw_formatted(ses, 3);
+	load_common(ses);
 	mem_free(rel);
 }
 
diff --git a/src/session/session.cpp b/src/session/session.cpp
index 9b6c418e..9e0ed7ef 100644
--- a/src/session/session.cpp
+++ b/src/session/session.cpp
@@ -579,7 +579,12 @@ display_timer(struct session *ses)
 		      (void (*)(void *)) display_timer,
 		      ses);
 	/* The expired timer ID has now been erased.  */
+	load_common(ses);
+}
 
+void
+load_common(struct session *ses)
+{
 	load_frames(ses, ses->doc_view);
 	load_css_imports(ses, ses->doc_view);
 	load_ecmascript_imports(ses, ses->doc_view);
@@ -587,7 +592,6 @@ display_timer(struct session *ses)
 	process_file_requests(ses);
 }
 
-
 struct questions_entry {
 	LIST_HEAD_EL(struct questions_entry);
 
diff --git a/src/session/session.h b/src/session/session.h
index bdfec0d9..e36f8395 100644
--- a/src/session/session.h
+++ b/src/session/session.h
@@ -313,6 +313,8 @@ struct frame *ses_find_iframe(struct session *, char *);
 
 void free_files(struct session *);
 void display_timer(struct session *ses);
+void load_common(struct session *ses);
+
 
 /** session_is_loading() is like !!get_current_download() but doesn't take
  * session.req_sent into account.