From 85d896b9539cb1a6717ac66a40ed7641ff6b5a02 Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Sat, 15 Jun 2013 10:55:18 +0200 Subject: [PATCH] Fix showing log windows on load with -l (initialization order). --- Windows/main.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Windows/main.cpp b/Windows/main.cpp index 719062c8f4..5366a05b76 100644 --- a/Windows/main.cpp +++ b/Windows/main.cpp @@ -64,11 +64,6 @@ int WINAPI WinMain(HINSTANCE _hInstance, HINSTANCE hPrevInstance, LPSTR szCmdLin hideLog = false; #endif - LogManager::Init(); - LogManager::GetInstance()->GetConsoleListener()->Open(hideLog, 150, 120, "PPSSPP Debug Console"); - LogManager::GetInstance()->SetLogLevel(LogTypes::G3D, LogTypes::LERROR); - - g_Config.Load(); // The rest is handled in NativeInit(). for (int i = 1; i < __argc; ++i) @@ -91,6 +86,12 @@ int WINAPI WinMain(HINSTANCE _hInstance, HINSTANCE hPrevInstance, LPSTR szCmdLin } } + g_Config.Load(); + + LogManager::Init(); + LogManager::GetInstance()->GetConsoleListener()->Open(hideLog, 150, 120, "PPSSPP Debug Console"); + LogManager::GetInstance()->SetLogLevel(LogTypes::G3D, LogTypes::LERROR); + VFSRegister("", new DirectoryAssetReader("assets/")); VFSRegister("", new DirectoryAssetReader(""));