From 5e54283e7ab71e94e7df98253a00c53c6d470e77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20P=C3=B6sel?= Date: Fri, 14 Jun 2013 11:46:49 +0000 Subject: Fixed Cancel button on Restarting dialog git-svn-id: http://svn.miranda-ng.org/main/trunk@4930 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/core/modules.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core/modules.cpp') diff --git a/src/core/modules.cpp b/src/core/modules.cpp index b36a6812cc..cc1e59b113 100644 --- a/src/core/modules.cpp +++ b/src/core/modules.cpp @@ -29,7 +29,7 @@ static DWORD mainThreadId; static HANDLE hMainThread; static HANDLE hMissingService; -void CheckRestart(); // core: IDD_WAITRESTART +int CheckRestart(); // core: IDD_WAITRESTART int LoadSystemModule(void); // core: m_system.h services int LoadNewPluginsModuleInfos(void); // core: preloading plugins @@ -95,7 +95,7 @@ int LoadDefaultModules(void) //load order is very important for these if ( LoadSystemModule()) return 1; if ( LoadLangpackModule()) return 1; // langpack will be a system module in the new order so this is moved here - CheckRestart(); + if ( CheckRestart()) return 1; if ( LoadUtilsModule()) return 1; //order not important for this, but no dependencies and no point in pluginising if ( LoadIcoTabsModule()) return 1; if ( LoadHeaderbarModule()) return 1; -- cgit v1.2.3