Opening a file in the map editor closes the current window if the current window is a blank slate

4 files changed, 22 insertions, 3 deletions

@@ -265,7 +265,13 @@ void MapeditFrame::OnOpen(wxCommandEvent&)
     return;
   }
   
-  OpenWorld(openFileDialog.GetPath().ToStdString());
+  if (OpenWorld(openFileDialog.GetPath().ToStdString()))
+  {
+    if (world->getEmpty())
+    {
+      Close(true);
+    }
+  }
 }
 
 void MapeditFrame::OnSave(wxCommandEvent&)
@@ -429,17 +435,21 @@ void MapeditFrame::NewWorld()
   LaunchWindow(std::unique_ptr<World>(new World()));
 }
 
-void MapeditFrame::OpenWorld(std::string filename)
+bool MapeditFrame::OpenWorld(std::string filename)
 {
   try
   {
     auto world = std::unique_ptr<World>(new World(filename));
     
     LaunchWindow(std::move(world));
+    
+    return true;
   } catch (std::exception& ex)
   {
     wxMessageBox(ex.what(), "Error loading world", wxOK | wxCENTRE | wxICON_ERROR);
   }
+  
+  return false;
 }
 
 void MapeditFrame::LaunchWindow(std::unique_ptr<World> world)
@@ -33,7 +33,7 @@ class MapeditFrame : public wxFrame {
     void MapDirtyDidChange(bool dirty);
     
     static void NewWorld();
-    static void OpenWorld(std::string filename);
+    static bool OpenWorld(std::string filename);
     
     std::list<wxWindow*>::iterator closer;
 
@@ -9,6 +9,7 @@ World::World()
   newMap();
   
   rootChildren.push_back(0);
+  empty = true;
 }
 
 World::World(std::string filename)
@@ -170,6 +171,7 @@ std::shared_ptr<Map> World::getMap(int id) const
 
 void World::setDirty(bool dirty)
 {
+  if (dirty) empty = false;
   this->dirty = dirty;
   parent->MapDirtyDidChange(dirty);
 }
@@ -372,3 +374,8 @@ void World::setLastMap(Map* map)
 {
   lastmap = map->getID();
 }
+
+bool World::getEmpty() const
+{
+  return empty;
+}
@@ -32,6 +32,7 @@ class World {
     void setLastMap(Map* map);
     std::list<std::shared_ptr<Map>> getRootMaps() const;
     const std::map<int, std::shared_ptr<Map>> getMaps() const;
+    bool getEmpty() const;
     
   private:
     MapeditFrame* parent;
@@ -41,6 +42,7 @@ class World {
     std::string filename;
     int lastmap = 0;
     std::list<int> rootChildren;
+    bool empty = false;
 };
 
 #endif