#5231: Fix MRU menu

codereader · Jun 19, 2020 · 4f328a9 · 4f328a9
1 parent c6f52c3
commit 4f328a9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/radiant/ui/mru/MRUMenu.h b/radiant/ui/mru/MRUMenu.h
@@ -57,7 +57,8 @@ class MRUMenu
 	{
 		clearMenu();
 
-		std::vector<std::string> filenames(GlobalMRU().getMaxNumberOfItems());
+		std::vector<std::string> filenames;
+		filenames.reserve(GlobalMRU().getMaxNumberOfItems());
 
 		GlobalMRU().foreachItem([&](std::size_t index, const std::string& filename)
 		{

diff --git a/radiantcore/map/Map.cpp b/radiantcore/map/Map.cpp
@@ -672,7 +672,11 @@ void Map::openMap(const cmd::ArgumentList& args)
 
     std::string fullPath;
 
-    if (args.empty())
+    if (!args.empty())
+    {
+        fullPath = args[0].getString();
+    }
+    else
     {
         // No arguments passed, get the map file name to load
         MapFileSelection fileInfo = MapFileManager::getMapFileSelection(true, _("Open map"), filetype::TYPE_MAP);

diff --git a/radiantcore/map/mru/MRU.cpp b/radiantcore/map/mru/MRU.cpp
@@ -157,7 +157,7 @@ void MRU::initialiseModule(const ApplicationContext& ctx)
 	_list.reset(new MRUList(_numMaxFiles));
 
 	GlobalCommandSystem().addCommand(LOAD_MRU_MAP_CMD,
-		std::bind(&MRU::loadMRUMap, this, std::placeholders::_1));
+		std::bind(&MRU::loadMRUMap, this, std::placeholders::_1), { cmd::ARGTYPE_INT });
 
 	// Create shortcuts for the items we hold
 	for (std::size_t i = 1; i <= _numMaxFiles; i++)