Changeset 7661 in orxonox.OLD for trunk/src/lib/parser/preferences

Timestamp:

May 18, 2006, 12:55:34 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the QT_GUI back to the trunk
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/qt_gui . -r7607:HEAD

absolutely no conflicts

File:

• trunk/src/lib/parser/preferences/ini_file_prefs_reader.cc (modified) (1 diff)

trunk/src/lib/parser/preferences/ini_file_prefs_reader.cc

@@ -28 +28 @@
   IniParser iniParser;
 
+  
+  Preferences* prefs = Preferences::getInstance();
+  
+  prefs->setUserIni( fileName );
+  
   if ( !iniParser.readFile( fileName ) )
     return;
-
-  Preferences* prefs = Preferences::getInstance();
 
   iniParser.firstSection();