From b2eb3a036d20568e415c9f2ad2e40b055d33c8c6 Mon Sep 17 00:00:00 2001
From: sithlord48 <sithlord48@gmail.com>
Date: Sun, 3 Aug 2025 00:00:20 -0400
Subject: [PATCH] refactor: move ClientApp::handleScreenError /
 ServerApp::handleScreenError to base App Class

---
 src/lib/deskflow/App.cpp       | 6 ++++++
 src/lib/deskflow/App.h         | 2 ++
 src/lib/deskflow/ClientApp.cpp | 6 ------
 src/lib/deskflow/ClientApp.h   | 1 -
 src/lib/deskflow/ServerApp.cpp | 6 ------
 src/lib/deskflow/ServerApp.h   | 1 -
 6 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/lib/deskflow/App.cpp b/src/lib/deskflow/App.cpp
index 70f5008ad..8c12b8693 100644
--- a/src/lib/deskflow/App.cpp
+++ b/src/lib/deskflow/App.cpp
@@ -184,6 +184,12 @@ void App::initApp(int argc, const char **argv)
   loadConfig();
 }
 
+void App::handleScreenError() const
+{
+  LOG((CLOG_CRIT "error on screen"));
+  getEvents()->addEvent(Event(EventTypes::Quit));
+}
+
 void App::runEventsLoop(void *)
 {
   m_events->loop();
diff --git a/src/lib/deskflow/App.h b/src/lib/deskflow/App.h
index a62976c1b..66378db73 100644
--- a/src/lib/deskflow/App.h
+++ b/src/lib/deskflow/App.h
@@ -109,6 +109,8 @@ public:
     return *s_instance;
   }
 
+  void handleScreenError() const;
+
 protected:
   void runEventsLoop(void *);
   void (*m_bye)(int);
diff --git a/src/lib/deskflow/ClientApp.cpp b/src/lib/deskflow/ClientApp.cpp
index 1b55efe8f..3f102ce46 100644
--- a/src/lib/deskflow/ClientApp.cpp
+++ b/src/lib/deskflow/ClientApp.cpp
@@ -200,12 +200,6 @@ void ClientApp::updateStatus(const std::string_view &) const
   // do nothing
 }
 
-void ClientApp::handleScreenError()
-{
-  LOG((CLOG_CRIT "error on screen"));
-  getEvents()->addEvent(Event(EventTypes::Quit));
-}
-
 deskflow::Screen *ClientApp::openClientScreen()
 {
   deskflow::Screen *screen = createScreen();
diff --git a/src/lib/deskflow/ClientApp.h b/src/lib/deskflow/ClientApp.h
index 540a7802c..812878d8f 100644
--- a/src/lib/deskflow/ClientApp.h
+++ b/src/lib/deskflow/ClientApp.h
@@ -65,7 +65,6 @@ public:
 
   void updateStatus() const;
   void updateStatus(const std::string_view &) const;
-  void handleScreenError();
   deskflow::Screen *openClientScreen();
   void closeClientScreen(deskflow::Screen *screen);
   void handleClientRestart(const Event &, EventQueueTimer *vtimer);
diff --git a/src/lib/deskflow/ServerApp.cpp b/src/lib/deskflow/ServerApp.cpp
index f0cad77c0..75a789232 100644
--- a/src/lib/deskflow/ServerApp.cpp
+++ b/src/lib/deskflow/ServerApp.cpp
@@ -519,12 +519,6 @@ PrimaryClient *ServerApp::openPrimaryClient(const std::string &name, deskflow::S
   return new PrimaryClient(name, screen);
 }
 
-void ServerApp::handleScreenError()
-{
-  LOG((CLOG_CRIT "error on screen"));
-  getEvents()->addEvent(Event(EventTypes::Quit));
-}
-
 void ServerApp::handleSuspend()
 {
   if (!m_suspended) {
diff --git a/src/lib/deskflow/ServerApp.h b/src/lib/deskflow/ServerApp.h
index b8ba5dd98..d21f29ee6 100644
--- a/src/lib/deskflow/ServerApp.h
+++ b/src/lib/deskflow/ServerApp.h
@@ -98,7 +98,6 @@ public:
   void retryHandler();
   deskflow::Screen *openServerScreen();
   PrimaryClient *openPrimaryClient(const std::string &name, deskflow::Screen *screen);
-  void handleScreenError();
   void handleSuspend();
   void handleResume();
   ClientListener *openClientListener(const NetworkAddress &address);