[Scummvm-git-logs] scummvm master -> ec993f744905fb0387e667bb6fe7b03096b3d376

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
d090ce3c0d Revert "BACKENDS: Attempt to solve circular dependency during linking. Courtesy of bmsbotje"
ec993f7449 BACKENDS: Another attempt to remove circular dependency


Commit: d090ce3c0d9fd072e058369218cfd6b756ad4509
    https://github.com/scummvm/scummvm/commit/d090ce3c0d9fd072e058369218cfd6b756ad4509
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-02-16T15:01:46+01:00

Commit Message:
Revert "BACKENDS: Attempt to solve circular dependency during linking. Courtesy of bmsbotje"

This reverts commit abb6c103a0d96b41cb8f8a3fa37e60089935d2e9.

Changed paths:
    backends/base-backend.cpp
    backends/printing/printman.cpp


diff --git a/backends/base-backend.cpp b/backends/base-backend.cpp
index 092b28c9f78..1cb38fffecb 100644
--- a/backends/base-backend.cpp
+++ b/backends/base-backend.cpp
@@ -31,11 +31,8 @@
 #include "backends/audiocd/default/default-audiocd.h"
 #endif
 
-#include "backends/printing/printman.h"
 
 #include "gui/message.h"
-#include "gui/printing-dialog.h"
-
 
 bool BaseBackend::setScaler(const char *name, int factor) {
 	if (!name)
@@ -93,8 +90,3 @@ void EventsBaseBackend::initBackend() {
 
 	BaseBackend::initBackend();
 }
-
-void Common::PrintingManager::printImage(const Graphics::ManagedSurface &surf) {
-	GUI::PrintingDialog dialog(surf);
-	dialog.runModal();
-}
diff --git a/backends/printing/printman.cpp b/backends/printing/printman.cpp
index efdff4bef33..baf716b052b 100644
--- a/backends/printing/printman.cpp
+++ b/backends/printing/printman.cpp
@@ -26,6 +26,8 @@
 
 #include "backends/printing/printman.h"
 
+#include "gui/printing-dialog.h"
+
 #ifdef USE_PNG
 #include "image/png.h"
 #else
@@ -44,6 +46,11 @@ Common::String PrintingManager::getDefaultPrinterName() const {
 	return Common::String();
 }
 
+void PrintingManager::printImage(const Graphics::ManagedSurface &surf) {
+	GUI::PrintingDialog dialog(surf);
+	dialog.runModal();
+}
+
 void PrintingManager::saveAsImage(const Graphics::ManagedSurface &surf, const Common::String &fileName) {
 	Common::String saveName = fileName;
 	Common::String currentTarget = ConfMan.getActiveDomainName();


Commit: ec993f744905fb0387e667bb6fe7b03096b3d376
    https://github.com/scummvm/scummvm/commit/ec993f744905fb0387e667bb6fe7b03096b3d376
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-02-16T15:08:04+01:00

Commit Message:
BACKENDS: Another attempt to remove circular dependency

Moving PrintingManager instantiation to BaseBackend

Changed paths:
    backends/base-backend.cpp
    common/system.cpp


diff --git a/backends/base-backend.cpp b/backends/base-backend.cpp
index 1cb38fffecb..eb4a6066daa 100644
--- a/backends/base-backend.cpp
+++ b/backends/base-backend.cpp
@@ -33,6 +33,7 @@
 
 
 #include "gui/message.h"
+#include "backends/printing/printman.h"
 
 bool BaseBackend::setScaler(const char *name, int factor) {
 	if (!name)
@@ -65,6 +66,10 @@ void BaseBackend::initBackend() {
 		_audiocdManager = new DefaultAudioCDManager();
 #endif
 	OSystem::initBackend();
+
+	// Initialize default printing manager unless overridden by backend
+	if (!_printingManager)
+		_printingManager = new Common::PrintingManager();
 }
 
 void BaseBackend::fillScreen(uint32 col) {
diff --git a/common/system.cpp b/common/system.cpp
index 48fc49e3772..4f74e223314 100644
--- a/common/system.cpp
+++ b/common/system.cpp
@@ -122,10 +122,6 @@ void OSystem::initBackend() {
 // 	if (!_fsFactory)
 // 		error("Backend failed to instantiate fs factory");
 
-	// Initialize default printing manager unless overridden by backend
-	if (!_printingManager)
-		_printingManager = new Common::PrintingManager();
-
 	_backendInitialized = true;
 }