[Pingus-CVS] r2567 - trunk/src

[jave27]

Author: jave27
Date: 2005-12-28 19:58:16 +0100 (Wed, 28 Dec 2005)
New Revision: 2567

Modified:
   trunk/src/file_dialog.cxx
   trunk/src/pingus_menu.cxx
Log:
Moved the pop_menu function back out to the main menu instead of inside the 
dialog box.

Modified: trunk/src/file_dialog.cxx
===================================================================
--- trunk/src/file_dialog.cxx   2005-12-28 17:53:40 UTC (rev 2566)
+++ trunk/src/file_dialog.cxx   2005-12-28 18:58:16 UTC (rev 2567)
@@ -403,7 +403,6 @@
                                listener->load(current_path + 
current_file.name, file_mask);
                        else
                                listener->save(current_path + 
current_file.name, file_mask);
-                       manager->pop_menu();
                }
        }
 

Modified: trunk/src/pingus_menu.cxx
===================================================================
--- trunk/src/pingus_menu.cxx   2005-12-28 17:53:40 UTC (rev 2566)
+++ trunk/src/pingus_menu.cxx   2005-12-28 18:58:16 UTC (rev 2567)
@@ -251,6 +251,7 @@
        // Worldmap
        else if (filemask == ".xml")
                do_start(file);
+       manager->pop_menu();
 }
                
 void