From 01bd255b36e4e19ba0a7a1cff3caf36bd6e04526 Mon Sep 17 00:00:00 2001
From: ali asaria <ali.asaria@gmail.com>
Date: Mon, 29 Jan 2024 15:42:13 -0500
Subject: [PATCH] bug fixes
---
.../components/Connect/LocalConnection.tsx | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/renderer/components/Connect/LocalConnection.tsx b/src/renderer/components/Connect/LocalConnection.tsx
index 1976642b..afaf6617 100644
--- a/src/renderer/components/Connect/LocalConnection.tsx
+++ b/src/renderer/components/Connect/LocalConnection.tsx
@@ -158,13 +158,14 @@ function RunServer({ activeStep, setActiveStep }) {
useEffect(() => {
if (activeStep !== 3) return;
- if (server) {
+ if (server && !serverError) {
+ console.log('I think things are good');
setActiveStep(4);
return;
} else {
setIntervalXTimes(
async () => {
- if (!server) return false;
+ if (!server || serverError) return false;
setActiveStep(4);
return true;
},
@@ -178,11 +179,13 @@ function RunServer({ activeStep, setActiveStep }) {
return (
<>
<Stack spacing={1}>
- {server && <Chip color="success">Success!</Chip>}
- {activeStep == 3 && !server && <Chip color="danger">Not Running</Chip>}
+ {server && !serverError && <Chip color="success">Success!</Chip>}
+ {activeStep == 3 && (!server || serverError) && (
+ <Chip color="danger">Not Running</Chip>
+ )}
<ButtonGroup variant="plain" spacing={1}>
{activeStep == 3 &&
- (!server ? (
+ (!server || serverError ? (
thinking ? (
<CircularProgress color="primary" />
) : (
@@ -197,7 +200,7 @@ function RunServer({ activeStep, setActiveStep }) {
//set interval to check if server is running every 2 seconds, 5 times:
setIntervalXTimes(
async () => {
- if (!server) return false;
+ if (!server || serverError) return false;
setThinking(false);
setActiveStep(4);
return true;
--
GitLab