chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 18:50:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX main.cpp 'make exist option --profile work properly'

Browse Source
This commit is contained in:
LoudSnorer 2024-03-31 20:28:18 -04:00
parent 50ee0d8ccc
commit e828e7dc6d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
oscar/main.cpp
View File

@ -296,7 +296,7 @@ void optionExit(int exitCode, QString error) {
Help Menu Help Menu
Option Description Option Description
-p Pauses execution for 1 second -p Pauses execution for 1 second
--profile <name> Name of profile. if name does not exist then uses last used profile. --profile <name> Name of profile. if name does not exist then uses profile tab.
--l or --language Force language prompt --l or --language Force language prompt
--datadir <folderName> Use folderName as Oscar Data folder. For relatve paths: <Documents folder>/<relative path>. --datadir <folderName> Use folderName as Oscar Data folder. For relatve paths: <Documents folder>/<relative path>.
If folder does not exist then prompts user. If folder does not exist then prompts user.
@ -397,7 +397,7 @@ int main(int argc, char *argv[]) {
// selection QDialog, which waits indefinitely for user input before MainWindow is constructed. // selection QDialog, which waits indefinitely for user input before MainWindow is constructed.
bool force_data_dir = false; bool force_data_dir = false;
QString load_profile = ""; QString load_profile; // null profile means no --profile param
for (int i = 1; i < args.size(); i++) { for (int i = 1; i < args.size(); i++) {
if ((args[i] == "--language") || (args[i] == "--l") ) { if ((args[i] == "--language") || (args[i] == "--l") ) {
settings.setValue(LangSetting,""); settings.setValue(LangSetting,"");
@ -645,6 +645,7 @@ int main(int argc, char *argv[]) {
QString language = settings.value(LangSetting, "").toString(); QString language = settings.value(LangSetting, "").toString();
AppSetting->setLanguage(language); AppSetting->setLanguage(language);
if (!load_profile.isEmpty()) AppSetting->setProfileName(load_profile);
// Set fonts from preferences file // Set fonts from preferences file
qDebug() << "App font before Prefs setting" << QApplication::font(); qDebug() << "App font before Prefs setting" << QApplication::font();