1 files changed, 23 insertions, 24 deletions

diff --git a/src/client/views/smartdraw/SmartDrawHandler.tsx b/src/client/views/smartdraw/SmartDrawHandler.tsx
index ca65ea388..c842551c3 100644
--- a/src/client/views/smartdraw/SmartDrawHandler.tsx
+++ b/src/client/views/smartdraw/SmartDrawHandler.tsx
@@ -51,6 +51,7 @@ export class SmartDrawHandler extends ObservableReactComponent<{}> {
     private _lastInput: DrawingOptions = { text: '', complexity: 5, size: 350, autoColor: true, x: 0, y: 0 };
     private _lastResponse: string = '';
     private _selectedDoc: Doc | undefined = undefined;
+    private _errorOccurredOnce = false;
 
     constructor(props: any) {
         super(props);
@@ -152,39 +153,37 @@ export class SmartDrawHandler extends ObservableReactComponent<{}> {
             this._showEditBox = false;
         } else {
             this._showOptions = false;
-            await this.drawWithGPT({ X: this._pageX, Y: this._pageY }, this._userInput, this._complexity, this._size, this._autoColor);
+            try {
+                await this.drawWithGPT({ X: this._pageX, Y: this._pageY }, this._userInput, this._complexity, this._size, this._autoColor);
+                this._showRegenerate = true;
+                this.hideSmartDrawHandler();
+            } catch (err) {
+                if (this._errorOccurredOnce) {
+                    console.error('GPT call failed', err);
+                    this._errorOccurredOnce = false;
+                } else {
+                    this._errorOccurredOnce = true;
+                    await this.drawWithGPT({ X: this._pageX, Y: this._pageY }, this._userInput, this._complexity, this._size, this._autoColor);
+                }
+            }
         }
         this._isLoading = false;
         this._canInteract = true;
     };
 
-    _errorOccurredOnce = false;
     @action
     drawWithGPT = async (startPt: { X: number; Y: number }, input: string, complexity: number, size: number, autoColor: boolean) => {
         if (input === '') return;
         this._lastInput = { text: input, complexity: complexity, size: size, autoColor: autoColor, x: startPt.X, y: startPt.Y };
-
-        try {
-            const res = await gptAPICall(`"${input}", "${complexity}", "${size}"`, GPTCallType.DRAW, undefined, true);
-            if (!res) {
-                console.error('GPT call failed');
-                return;
-            }
-            console.log(res);
-            const strokeData = await this.parseResponse(res, startPt, false, autoColor);
-            this._errorOccurredOnce = false;
-            this.hideSmartDrawHandler();
-            this._showRegenerate = true;
-            return strokeData;
-        } catch (err) {
-            if (this._errorOccurredOnce) {
-                console.error('GPT call failed', err);
-                this._errorOccurredOnce = false;
-            } else {
-                this._errorOccurredOnce = true;
-                this.drawWithGPT(startPt, input, complexity, size, autoColor);
-            }
+        const res = await gptAPICall(`"${input}", "${complexity}", "${size}"`, GPTCallType.DRAW, undefined, true);
+        if (!res) {
+            console.error('GPT call failed');
+            return;
         }
+        console.log(res);
+        const strokeData = await this.parseResponse(res, startPt, false, autoColor);
+        this._errorOccurredOnce = false;
+        return strokeData;
     };
 
     @action
@@ -212,7 +211,7 @@ export class SmartDrawHandler extends ObservableReactComponent<{}> {
                 return;
             }
             console.log(res);
-            this.parseResponse(res, { X: this._lastInput.x, Y: this._lastInput.y }, true, lastInput?.autoColor || this._autoColor);
+            await this.parseResponse(res, { X: this._lastInput.x, Y: this._lastInput.y }, true, lastInput?.autoColor || this._autoColor);
         } catch (err) {
             console.error('GPT call failed', err);
         }