Commit 3da2e65f authored by Jan Möbius's avatar Jan Möbius
Browse files

Dont load global settings twice

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@4588 383ad7c9-94d9-4d36-a494-682f7c89f535
parent cb7c473a
...@@ -125,6 +125,7 @@ Core() : ...@@ -125,6 +125,7 @@ Core() :
// Get all relevant Paths and Options from option files // Get all relevant Paths and Options from option files
setupOptions(); setupOptions();
// set discriptions for scriptable slots // set discriptions for scriptable slots
setDescriptions(); setDescriptions();
} }
...@@ -422,8 +423,9 @@ Core::init() { ...@@ -422,8 +423,9 @@ Core::init() {
QApplication::processEvents(); QApplication::processEvents();
} }
// Load global ini files. Use plugin and global options from these files but dont load objects // Load global ini files. Use only plugin global options from these files as the
openIniFile( optionFiles[i] ,true,true,false); // rest has been loaded at the beginning.
openIniFile( optionFiles[i] ,false,true,false);
} }
// =============================================================================================== // ===============================================================================================
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment