Merge pull request #2516 from Capostrophic/launcher

Launcher: Avoid Qt "opening user openmw.cfg twice" warning
pull/541/head
Andrei Kortunov 5 years ago committed by GitHub
commit 6c006c9c87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -329,6 +329,7 @@ bool Launcher::MainDialog::setupGameSettings()
stream.setCodec(QTextCodec::codecForName("UTF-8")); stream.setCodec(QTextCodec::codecForName("UTF-8"));
mGameSettings.readUserFile(stream); mGameSettings.readUserFile(stream);
file.close();
} }
// Now the rest - priority: user > local > global // Now the rest - priority: user > local > global
@ -353,9 +354,9 @@ bool Launcher::MainDialog::setupGameSettings()
stream.setCodec(QTextCodec::codecForName("UTF-8")); stream.setCodec(QTextCodec::codecForName("UTF-8"));
mGameSettings.readFile(stream); mGameSettings.readFile(stream);
}
file.close(); file.close();
} }
}
return true; return true;
} }

Loading…
Cancel
Save