[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus/src/editor editloop.c
From: |
address@hidden |
Subject: |
[Stratagus-CVS] stratagus/src/editor editloop.c |
Date: |
24 Jan 2004 14:53:27 +1100 |
CVSROOT: /home/strat
Module name: stratagus
Changes by: <address@hidden> 04/01/24 14:53:26
Modified files:
src/editor : editloop.c
Log message:
Don't do clean up when quitting to the menu, MenuLoop cleans up
Patches:
Index: stratagus/src/editor/editloop.c
diff -u stratagus/src/editor/editloop.c:1.158
stratagus/src/editor/editloop.c:1.159
--- stratagus/src/editor/editloop.c:1.158 Thu Jan 22 17:18:18 2004
+++ stratagus/src/editor/editloop.c Sat Jan 24 14:53:26 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: editloop.c,v 1.158 2004/01/22 06:18:18 wizzard Exp $
+// $Id: editloop.c,v 1.159 2004/01/24 03:53:26 jsalmon3 Exp $
//@{
@@ -2014,7 +2014,7 @@
OldCommandLogDisabled = CommandLogDisabled;
CommandLogDisabled = 1;
- do {
+ while (1) {
EditorMapLoaded = 0;
EditorRunning = 1;
@@ -2073,9 +2073,10 @@
WaitEventsOneFrame(&callbacks);
}
- //
- // Restore all for menu
- //
+ if (!EditorMapLoaded) {
+ break;
+ }
+
CleanModules();
LoadCcl(); // Reload the main config file
@@ -2087,7 +2088,7 @@
VideoClearScreen();
Invalidate();
- } while (EditorMapLoaded);
+ }
CommandLogDisabled = OldCommandLogDisabled;
}