foxygit / doom Log in
commit fe1a0afdd7acec6705ccf0ada6b51eae9aae2870
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Thu Aug 31 18:11:47 2006 +0000
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Thu Aug 31 18:11:47 2006 +0000

    Exit the main loop automatically after all windows are closed

    Subversion-branch: /trunk/chocolate-doom
    Subversion-revision: 577
---
 textscreen/txt_desktop.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/textscreen/txt_desktop.c b/textscreen/txt_desktop.c
index e9673434..803fa4fc 100644
--- a/textscreen/txt_desktop.c
+++ b/textscreen/txt_desktop.c
@@ -147,15 +147,6 @@ void TXT_DispatchEvents(void)

             TXT_WindowKeyPress(all_windows[num_windows - 1], c);
         }
-        else
-        {
-            // No windows
-
-            if (c == KEY_ESCAPE)
-            {
-                TXT_ExitMainLoop();
-            }
-        }
     }
 }

@@ -171,7 +162,16 @@ void TXT_GUIMainLoop(void)
     while (main_loop_running)
     {
         TXT_DispatchEvents();
+
+        // After the last window is closed, exit the loop
+
+        if (num_windows <= 0)
+        {
+            TXT_ExitMainLoop();
+        }
+
         TXT_DrawDesktop();
+        TXT_Sleep(0);
     }
 }