summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/config.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/config.cpp')
-rw-r--r--src/emu/config.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/emu/config.cpp b/src/emu/config.cpp
index 81a486f73af..19c88f8765d 100644
--- a/src/emu/config.cpp
+++ b/src/emu/config.cpp
@@ -2,15 +2,17 @@
// copyright-holders:Nicola Salmoria, Aaron Giles
/***************************************************************************
- config.c
+ config.cpp
Configuration file I/O.
***************************************************************************/
#include "emu.h"
-#include "emuopts.h"
-#include "drivenum.h"
#include "config.h"
+
+#include "drivenum.h"
+#include "emuopts.h"
+
#include "xmlfile.h"
#define DEBUG_CONFIG 0
@@ -69,7 +71,7 @@ int configuration_manager::load_settings()
/* open the config file */
emu_file file(machine().options().ctrlr_path(), OPEN_FLAG_READ);
osd_printf_verbose("Attempting to parse: %s.cfg\n",controller);
- osd_file::error filerr = file.open(controller, ".cfg");
+ osd_file::error filerr = file.open(std::string(controller) + ".cfg");
if (filerr != osd_file::error::NONE)
throw emu_fatalerror("Could not load controller file %s.cfg", controller);
@@ -87,7 +89,7 @@ int configuration_manager::load_settings()
load_xml(file, config_type::DEFAULT);
/* finally, load the game-specific file */
- filerr = file.open(machine().basename(), ".cfg");
+ filerr = file.open(machine().basename() + ".cfg");
osd_printf_verbose("Attempting to parse: %s.cfg\n",machine().basename());
if (filerr == osd_file::error::NONE)
loaded = load_xml(file, config_type::GAME);
@@ -115,7 +117,7 @@ void configuration_manager::save_settings()
save_xml(file, config_type::DEFAULT);
/* finally, save the game-specific file */
- filerr = file.open(machine().basename(), ".cfg");
+ filerr = file.open(machine().basename() + ".cfg");
if (filerr == osd_file::error::NONE)
save_xml(file, config_type::GAME);