[openMSX-commits] CVS: openMSX/src main.cc,1.73,1.74

[Wouter V. <m97...@us...>]

Update of /cvsroot/openmsx/openMSX/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6215/src

Modified Files:
	main.cc 
Log Message:
only save non-default key bindings

Index: main.cc
===================================================================
RCS file: /cvsroot/openmsx/openMSX/src/main.cc,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- main.cc	16 Jun 2005 19:35:27 -0000	1.73
+++ main.cc	29 Jun 2005 18:20:11 -0000	1.74
@@ -14,13 +14,14 @@
 #include "CommandLineParser.hh"
 #include "CartridgeSlotManager.hh"
 #include "CliComm.hh"
-#include "HotKey.hh"
 #include "CliServer.hh"
 #include "AfterCommand.hh"
 #include "Interpreter.hh"
 #include "Display.hh"
 #include "RendererFactory.hh"
 #include "MSXException.hh"
+#include "HotKey.hh"
+#include "SettingsConfig.hh"
 
 using std::auto_ptr;
 using std::cerr;
@@ -53,12 +54,16 @@
 	try {
 		Interpreter::instance().init(argv[0]);
 		MSXMotherBoard motherBoard;
+		
+		// TODO cleanup once singleton mess is cleaned up
+		HotKey hotKey;
+		SettingsConfig::instance().setHotKey(&hotKey);
+
 		CommandLineParser parser(motherBoard);
 		parser.parse(argc, argv);
 		CommandLineParser::ParseStatus parseStatus = parser.getParseStatus();
 		if (parseStatus != CommandLineParser::EXIT) {
 			initializeSDL();
-			HotKey hotkey;
 			AfterCommand afterCommand;
 			RendererFactory::createVideoSystem();
 			motherBoard.readConfig();
@@ -66,6 +71,9 @@
 			// CliServer cliServer; // disabled for security reasons
 			reactor.run(parseStatus == CommandLineParser::RUN);
 		}
+		
+		SettingsConfig::instance().setHotKey(NULL);
+
 	} catch (FatalError& e) {
 		cerr << "Fatal error: " << e.getMessage() << endl;
 		err = 1;