From 53b558d16cd5d18f8fef4ea4fcc469e8d6588701 Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Fri, 15 May 2015 21:11:28 -0400 Subject: [PATCH] Migrated init.c, I think... --- redo/windows/init.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/redo/windows/init.c b/redo/windows/init.c index 38d10994..d546d3c6 100644 --- a/redo/windows/init.c +++ b/redo/windows/init.c @@ -101,6 +101,10 @@ const char *uiInit(uiInitOptions *o) if (hDefaultCursor == NULL) return loadLastError("loading default cursor for window classes"); + ce = initUtilWindow(hDefaultIcon, hDefaultCursor); + if (ce != NULL) + return loadLastError(ce); + if (registerWindowClass(hDefaultIcon, hDefaultCursor) == 0) return loadLastError("registering uiWindow window class"); @@ -112,9 +116,8 @@ const char *uiInit(uiInitOptions *o) if (hMessageFont == NULL) return loadLastError("loading default messagebox font; this is the default UI font"); - ce = initContainer(hDefaultIcon, hDefaultCursor); - if (ce != NULL) - return loadLastError(ce); + if (initContainer(hDefaultIcon, hDefaultCursor) == 0) + return loadLastError("initializing uiMakeContainer() window class"); if (SetConsoleCtrlHandler(consoleCtrlHandler, TRUE) == 0) return loadLastError("setting up console end session handler");