Macros return to initial directory upon error

tproffen · Jan 16, 2025 · 21dc3e9 · 21dc3e9
1 parent c6d5b43
commit 21dc3e9
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/kuplot/prog/fit_top.f90 b/kuplot/prog/fit_top.f90
@@ -385,7 +385,7 @@ SUBROUTINE do_f66(zei, lp)
                   prompt = orig_prompt
                   RETURN
                ELSE
-                  CALL macro_close 
+                  CALL macro_close(-1)
                   prompt_status = PROMPT_ON 
                ENDIF 
             ENDIF 

diff --git a/kuplot/prog/kuplot_2dmap.f90 b/kuplot/prog/kuplot_2dmap.f90
@@ -176,7 +176,7 @@ SUBROUTINE kuplot_2dm_menu
                RETURN
             ELSE
                IF(lmacro_close) THEN
-                  CALL macro_close 
+                  CALL macro_close(-1)
                   prompt_status = PROMPT_ON 
                ENDIF 
             ENDIF 

diff --git a/kuplot/prog/kuplot_3dmap.f90 b/kuplot/prog/kuplot_3dmap.f90
@@ -182,7 +182,7 @@ SUBROUTINE kuplot_3dm_menu(string, length)
                RETURN
             ELSE
                IF(lmacro_close) THEN
-                  CALL macro_close 
+                  CALL macro_close(-1)
                   prompt_status = PROMPT_ON 
                ENDIF 
             ENDIF 

diff --git a/kuplot/prog/kuplot_adt.f90 b/kuplot/prog/kuplot_adt.f90
@@ -120,7 +120,7 @@ subroutine adt_menu
                RETURN
             ELSE
                IF(lmacro_close) THEN
-                  CALL macro_close
+                  CALL macro_close(-1)
                   prompt_status = PROMPT_ON
                ENDIF
             ENDIF

diff --git a/kuplot/prog/kuplot_loop.f90 b/kuplot/prog/kuplot_loop.f90
@@ -65,7 +65,7 @@ recursive SUBROUTINE kuplot_loop
             CALL errlist 
             IF (ier_sta.ne.ER_S_LIVE) THEN 
                IF (lmakro) THEN 
-                  CALL macro_close 
+                  CALL macro_close(-1)
                   prompt_status = PROMPT_ON 
                ENDIF 
                lblock = .false. 
@@ -89,7 +89,7 @@ recursive SUBROUTINE kuplot_loop
                      EXIT main
                   ELSE
                      IF(lmacro_close) THEN
-                        CALL macro_close
+                        CALL macro_close(-1)
                         lmakro_error = .FALSE.
                         PROMPT_STATUS = PROMPT_ON
                         sprompt = ' '

diff --git a/kuplot/prog/kuplot_py.f90 b/kuplot/prog/kuplot_py.f90
@@ -91,7 +91,7 @@ SUBROUTINE command (incomming, ier_status)
 IF( ier_num /= 0 ) THEN         ! Handle error messages
    CALL errlist
    ier_status = -1
-   CALL macro_close
+   CALL macro_close(-1)
    CALL no_error
 ELSE
    main: DO WHILE( lmakro )     ! Initial command was a macro, run this macro

diff --git a/kuplot/prog/kuplot_save.f90 b/kuplot/prog/kuplot_save.f90
@@ -703,7 +703,7 @@ SUBROUTINE do_ksav (zei, lp)
                      RETURN 
                   ELSE
                      IF(lmacro_close) THEN
-                        CALL macro_close 
+                        CALL macro_close(-1)
                         prompt_status = PROMPT_ON 
                      ENDIF 
                   ENDIF