Permalink
Browse files

GUI: Minor logging and directory fixes

  • Loading branch information...
endrift committed Jan 8, 2018
1 parent 0709898 commit a796c167e432c7106d5d892dc4917a4a38240a7f
Showing with 4 additions and 4 deletions.
  1. +2 −2 src/core/core.c
  2. +2 −2 src/feature/gui/gui-runner.c
View
@@ -276,15 +276,15 @@ void mCoreInitConfig(struct mCore* core, const char* port) {
}
void mCoreLoadConfig(struct mCore* core) {
-#ifndef MINIMAL_CORE
+#if !defined(MINIMAL_CORE) || MINIMAL_CORE < 2
mCoreConfigLoad(&core->config);
#endif
mCoreLoadForeignConfig(core, &core->config);
}
void mCoreLoadForeignConfig(struct mCore* core, const struct mCoreConfig* config) {
mCoreConfigMap(config, &core->opts);
-#ifndef MINIMAL_CORE
+#if !defined(MINIMAL_CORE) || MINIMAL_CORE < 2
mDirectorySetMapOptions(&core->dirs, &core->opts);
#endif
if (core->opts.audioBuffers) {
@@ -165,6 +165,7 @@ void mGUIInit(struct mGUIRunner* runner, const char* port) {
mCoreConfigSetDefaultIntValue(&runner->config, "volume", 0x100);
mCoreConfigSetDefaultValue(&runner->config, "idleOptimization", "detect");
mCoreConfigLoad(&runner->config);
+ mCoreConfigGetIntValue(&runner->config, "logLevel", &logger.logLevel);
char path[PATH_MAX];
mCoreConfigDirectory(path, PATH_MAX);
@@ -283,7 +284,7 @@ void mGUIRun(struct mGUIRunner* runner, const char* path) {
if (runner->core) {
mLOG(GUI_RUNNER, INFO, "Found core");
runner->core->init(runner->core);
- mCoreConfigInit(&runner->core->config, runner->port);
+ mCoreInitConfig(runner->core, runner->port);
mInputMapInit(&runner->core->inputMap, &GBAInputInfo);
found = mCoreLoadFile(runner->core, path);
if (!found) {
@@ -302,7 +303,6 @@ void mGUIRun(struct mGUIRunner* runner, const char* path) {
}
mLOG(GUI_RUNNER, DEBUG, "Loading config...");
mCoreLoadForeignConfig(runner->core, &runner->config);
- logger.logLevel = runner->core->opts.logLevel;
mLOG(GUI_RUNNER, DEBUG, "Loading save...");
mCoreAutoloadSave(runner->core);

0 comments on commit a796c16

Please sign in to comment.