From 0d53b11dc4ff76feb2fc4eb7a2d004b629c4ca05 Mon Sep 17 00:00:00 2001
From: Denis Shatskiy <admin@shts.su>
Date: Thu, 10 Jul 2025 11:00:33 +0700
Subject: [PATCH] fix: Ensure safe removal of event listeners in
 EditServerModal and DeleteServerModal to prevent potential memory leaks

---
 frontend/src/ServerManager.jsx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/frontend/src/ServerManager.jsx b/frontend/src/ServerManager.jsx
index f92b328..d5377fb 100644
--- a/frontend/src/ServerManager.jsx
+++ b/frontend/src/ServerManager.jsx
@@ -533,7 +533,9 @@ function EditServerModal({ show, server, onChange, onSave, onClose }) {
       const handler = () => onClose && onClose();
       modalRef.current.addEventListener('hide.bs.modal', handler);
       return () => {
-        modalRef.current.removeEventListener('hide.bs.modal', handler);
+        if (modalRef.current) {
+          modalRef.current.removeEventListener('hide.bs.modal', handler);
+        }
       };
     }
   }, [show, onClose]);
@@ -600,7 +602,9 @@ function DeleteServerModal({ show, server, onDelete, onClose }) {
       const handler = () => onClose && onClose();
       modalRef.current.addEventListener('hide.bs.modal', handler);
       return () => {
-        modalRef.current.removeEventListener('hide.bs.modal', handler);
+        if (modalRef.current) {
+          modalRef.current.removeEventListener('hide.bs.modal', handler);
+        }
       };
     }
   }, [show, onClose]);