updated dependencies

git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@283 4f64403b-2f21-0410-a795-97e2b3489a10

1 files changed, 10 insertions, 10 deletions

diff --git a/iax/dllmain.cpp b/iax/dllmain.cpp
index 957d779..69f5776 100644
--- a/iax/dllmain.cpp
+++ b/iax/dllmain.cpp
@@ -77,8 +77,17 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) {
 	}

 

 	InitIcons();

-	InitMenu();

 	

+	PreInitOptions();

+

+	if(!InitIAXInterface()) {

+		MessageBox(0, Translate("Failed to initialize IAX Client library. Plugin disabled."), Translate("IAX Plugin error"), MB_OK | MB_ICONERROR);

+		return 1;

+	}

+

+	InitOptions();

+	InitMenu();

+

 	return 0;

 }

 

@@ -98,13 +107,6 @@ extern "C" __declspec (dllexport) int __cdecl Load(PLUGINLINK *link) {
 		return 1;

 	}

 

-	PreInitOptions();

-

-	if(!InitIAXInterface()) {

-		MessageBox(0, Translate("Failed to initialize IAX Client library. Plugin disabled."), Translate("IAX Plugin error"), MB_OK | MB_ICONERROR);

-		return 1;

-	}

-

 	if(ServiceExists(MS_DB_SETSETTINGRESIDENT)) { // 0.6+

 		CallService(MS_DB_SETSETTINGRESIDENT, TRUE, (LPARAM)(MODULE "/Status"));

 		CallService(MS_DB_SETSETTINGRESIDENT, TRUE, (LPARAM)(MODULE "/LineNo"));

@@ -128,8 +130,6 @@ extern "C" __declspec (dllexport) int __cdecl Load(PLUGINLINK *link) {
 	// since we can call people when not registered...

 	SetContactStatus(ID_STATUS_ONLINE);

 

-	InitOptions();

-

 	// hook modules loaded

 	hModulesLoaded = HookEvent(ME_SYSTEM_MODULESLOADED, ModulesLoaded);

 	hPreShutdown = HookEvent(ME_SYSTEM_PRESHUTDOWN, PreShutdown);