Merge pull request #76 from r3dp0int/curses-fix

Fix: Issue #69: "Possibly curses-related issue" thanks @r3dp0int for your contribution !
Orange-Cyberdefense · Feb 8, 2024 · ca57d8b · ca57d8b
2 parents 0d4ad2d + 3b7589f
commit ca57d8b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/arsenal/app.py b/arsenal/app.py
@@ -5,6 +5,7 @@
 import termios
 import re
 import time
+from curses import wrapper
 
 # arsenal
 from . import __version__
@@ -188,4 +189,4 @@ def main():
 
 
 if __name__ == "__main__":
-    main()
+    wrapper(main()) 
diff --git a/arsenal/modules/gui.py b/arsenal/modules/gui.py
@@ -314,9 +314,8 @@ def run(self, stdscr):
                     # if len(Gui.cmd.args) != 0:
                     # args needed -> ask
                     args_menu = ArgslistMenu(self)
-                    curses.endwin()
-                    curses.echo()
-                    wrapper(args_menu.run)
+                    args_menu.run(stdscr) 
+                    stdscr.refresh()
                     break
             elif c == curses.KEY_F10 or c == 27:
                 Gui.cmd = None
@@ -379,7 +378,6 @@ def run(self, stdscr):
                 # new search -> reset position
                 self.position = 0
                 self.page_position = 0
-        curses.endwin()
 
 
 class ArgslistMenu:
@@ -690,7 +688,9 @@ def run(self, stdscr):
         """
         # init
         Gui.init_colors()
+        stdscr.clear()
         while True:
+            stdscr.refresh()
             self.draw(stdscr)
             c = stdscr.getch()
             if c == curses.KEY_ENTER or c == 10 or c == 13:
@@ -701,8 +701,8 @@ def run(self, stdscr):
                     break
             elif c == curses.KEY_F10 or c == 27:
                 # exit args_menu -> return to cheatslist_menu
-                curses.endwin()
-                wrapper(self.previous_menu.run)
+                self.previous_menu.run(stdscr)
+                stdscr.refresh()
                 break
             elif c == curses.KEY_DOWN:
                 self.next_arg()